diff options
| author | alokp@chromium.org <alokp@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-26 19:52:02 +0000 |
|---|---|---|
| committer | alokp@chromium.org <alokp@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-26 19:52:02 +0000 |
| commit | bf947d465abe73d7030239a217dc477c33b6a200 (patch) | |
| tree | 1d88497fee80eafd7a0b83f8ddac0e82a3795c9e /gpu/command_buffer | |
| parent | 48dc9e15affd5237dde74fddfdd243db40e96b36 (diff) | |
| download | chromium_src-bf947d465abe73d7030239a217dc477c33b6a200.zip chromium_src-bf947d465abe73d7030239a217dc477c33b6a200.tar.gz chromium_src-bf947d465abe73d7030239a217dc477c33b6a200.tar.bz2 | |
Bumped ANGLE rev and related changes.
Review URL: http://codereview.chromium.org/3148038
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@57568 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'gpu/command_buffer')
| -rw-r--r-- | gpu/command_buffer/service/gles2_cmd_decoder.cc | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/gpu/command_buffer/service/gles2_cmd_decoder.cc b/gpu/command_buffer/service/gles2_cmd_decoder.cc index 6940f8d..7d7a364 100644 --- a/gpu/command_buffer/service/gles2_cmd_decoder.cc +++ b/gpu/command_buffer/service/gles2_cmd_decoder.cc @@ -1674,17 +1674,21 @@ bool GLES2DecoderImpl::Initialize(gfx::GLContext* context, } TBuiltInResource resources; - resources.maxVertexAttribs = group_->max_vertex_attribs(); - resources.maxVertexUniformVectors = + ShInitBuiltInResource(&resources); + resources.MaxVertexAttribs = group_->max_vertex_attribs(); + resources.MaxVertexUniformVectors = group_->max_vertex_uniform_vectors(); - resources.maxVaryingVectors = group_->max_varying_vectors(); - resources.maxVertexTextureImageUnits = + resources.MaxVaryingVectors = group_->max_varying_vectors(); + resources.MaxVertexTextureImageUnits = group_->max_vertex_texture_image_units(); - resources.maxCombinedTextureImageUnits = group_->max_texture_units(); - resources.maxTextureImageUnits = group_->max_texture_image_units(); - resources.maxFragmentUniformVectors = + resources.MaxCombinedTextureImageUnits = group_->max_texture_units(); + resources.MaxTextureImageUnits = group_->max_texture_image_units(); + resources.MaxFragmentUniformVectors = group_->max_fragment_uniform_vectors(); - resources.maxDrawBuffers = 1; + resources.MaxDrawBuffers = 1; + // TODO(alokp): Figure out if OES_standard_derivatives extension is + // available. + resources.OES_standard_derivatives = 0; vertex_compiler_ = ShConstructCompiler(EShLangVertex, EShSpecGLES2, &resources); if (vertex_compiler_ == NULL) { |