summaryrefslogtreecommitdiffstats
path: root/gpu
diff options
context:
space:
mode:
authoratwilson@chromium.org <atwilson@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-09-23 00:39:56 +0000
committeratwilson@chromium.org <atwilson@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-09-23 00:39:56 +0000
commit30d20ce3f77a058f2d935aedddfc76f7d691e6d8 (patch)
tree1021e86513bea4f7bc7b2b96e7900deb71d77b43 /gpu
parent9878efd8e15fcb1919cc65c5ca35948e6bcd6750 (diff)
downloadchromium_src-30d20ce3f77a058f2d935aedddfc76f7d691e6d8.zip
chromium_src-30d20ce3f77a058f2d935aedddfc76f7d691e6d8.tar.gz
chromium_src-30d20ce3f77a058f2d935aedddfc76f7d691e6d8.tar.bz2
Revert 60236 - Fix WebGL getParameter bug in command buffer.
GetHelper was turning all getParameter return values into integers, even if they should have been floats. By returning false in GetHelper, it lets the individual DoGet(Float,Boolean,Integer)v functions skip this behavior and return the real value directly. BUG=51331 TEST=LayoutTests/fast/canvas/webgl/gl-get-calls.html R=apatrick,gman Patch by Adrienne Walker (enne@chromium.org) Originally reviewed at http://codereview.chromium.org/3023042 Review URL: http://codereview.chromium.org/3402026 TBR=darin@chromium.org Review URL: http://codereview.chromium.org/3396017 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@60247 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'gpu')
-rw-r--r--gpu/command_buffer/service/gles2_cmd_decoder.cc5
1 files changed, 4 insertions, 1 deletions
diff --git a/gpu/command_buffer/service/gles2_cmd_decoder.cc b/gpu/command_buffer/service/gles2_cmd_decoder.cc
index 68fa2f3..4a38f62 100644
--- a/gpu/command_buffer/service/gles2_cmd_decoder.cc
+++ b/gpu/command_buffer/service/gles2_cmd_decoder.cc
@@ -2616,7 +2616,10 @@ bool GLES2DecoderImpl::GetHelper(
return true;
default:
*num_written = util_.GLGetNumValuesReturned(pname);
- return false;
+ if (params) {
+ glGetIntegerv(pname, params);
+ }
+ return true;
}
}