summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorgman@chromium.org <gman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-06-01 23:07:21 +0000
committergman@chromium.org <gman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-06-01 23:07:21 +0000
commitcd6cd476f3e0d0333af92a7e4f2370625d2d467c (patch)
treebf61b8784fc818e2b9e988e03b6601f6c11e121f
parentdc35d36067767d6f3f9dd4ab2951c3520846ec9b (diff)
downloadchromium_src-cd6cd476f3e0d0333af92a7e4f2370625d2d467c.zip
chromium_src-cd6cd476f3e0d0333af92a7e4f2370625d2d467c.tar.gz
chromium_src-cd6cd476f3e0d0333af92a7e4f2370625d2d467c.tar.bz2
Change black to 0,0,0,1 instead of 0,0,0,0.003921
TEST=none BUG=none Review URL: http://codereview.chromium.org/2469003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@48671 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--gpu/command_buffer/service/gles2_cmd_decoder.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/gpu/command_buffer/service/gles2_cmd_decoder.cc b/gpu/command_buffer/service/gles2_cmd_decoder.cc
index 7a9d35f..033a819 100644
--- a/gpu/command_buffer/service/gles2_cmd_decoder.cc
+++ b/gpu/command_buffer/service/gles2_cmd_decoder.cc
@@ -1110,7 +1110,7 @@ class GLES2DecoderImpl : public base::SupportsWeakPtr<GLES2DecoderImpl>,
// Which textures are bound to texture units through glActiveTexture.
scoped_array<TextureUnit> texture_units_;
- // Black (0,0,0,0) textures for when non-renderable textures are used.
+ // Black (0,0,0,1) textures for when non-renderable textures are used.
// NOTE: There is no corresponding TextureInfo for these textures.
// TextureInfos are only for textures the client side can access.
GLuint black_2d_texture_id_;
@@ -1471,7 +1471,7 @@ bool GLES2DecoderImpl::Initialize(gfx::GLContext* context,
// Make black textures for replacing non-renderable textures.
black_2d_texture_id_ = ids[0];
black_cube_texture_id_ = ids[1];
- static int8 black[] = {0, 0, 0, 1};
+ static uint8 black[] = {0, 0, 0, 255};
glBindTexture(GL_TEXTURE_2D, black_2d_texture_id_);
glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, 1, 1, 0, GL_RGBA,
GL_UNSIGNED_BYTE, black);