Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(141)

Unified Diff: gpu/command_buffer/service/gles2_cmd_decoder.cc

Issue 1126173003: Fix Get* calls in GPU Command buffer. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@tex
Patch Set: Created 5 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « gpu/command_buffer/common/capabilities.cc ('k') | gpu/ipc/gpu_command_buffer_traits_multi.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: gpu/command_buffer/service/gles2_cmd_decoder.cc
diff --git a/gpu/command_buffer/service/gles2_cmd_decoder.cc b/gpu/command_buffer/service/gles2_cmd_decoder.cc
index 499f337fbabd207e17fbc864311f81f796501069..efb8c9725227db9df253076808837ad658345025 100644
--- a/gpu/command_buffer/service/gles2_cmd_decoder.cc
+++ b/gpu/command_buffer/service/gles2_cmd_decoder.cc
@@ -2983,14 +2983,14 @@ Capabilities GLES2DecoderImpl::GetCapabilities() {
DoGetIntegerv(GL_MAX_3D_TEXTURE_SIZE, &caps.max_3d_texture_size);
DoGetIntegerv(GL_MAX_ARRAY_TEXTURE_LAYERS, &caps.max_array_texture_layers);
DoGetIntegerv(GL_MAX_COLOR_ATTACHMENTS, &caps.max_color_attachments);
- DoGetIntegerv(GL_MAX_COMBINED_FRAGMENT_UNIFORM_COMPONENTS,
- &caps.max_combined_fragment_uniform_components);
+ DoGetInteger64v(GL_MAX_COMBINED_FRAGMENT_UNIFORM_COMPONENTS,
+ &caps.max_combined_fragment_uniform_components);
DoGetIntegerv(GL_MAX_COMBINED_UNIFORM_BLOCKS,
&caps.max_combined_uniform_blocks);
- DoGetIntegerv(GL_MAX_COMBINED_VERTEX_UNIFORM_COMPONENTS,
- &caps.max_combined_vertex_uniform_components);
+ DoGetInteger64v(GL_MAX_COMBINED_VERTEX_UNIFORM_COMPONENTS,
+ &caps.max_combined_vertex_uniform_components);
DoGetIntegerv(GL_MAX_DRAW_BUFFERS, &caps.max_draw_buffers);
- DoGetIntegerv(GL_MAX_ELEMENT_INDEX, &caps.max_element_index);
+ DoGetInteger64v(GL_MAX_ELEMENT_INDEX, &caps.max_element_index);
DoGetIntegerv(GL_MAX_ELEMENTS_INDICES, &caps.max_elements_indices);
DoGetIntegerv(GL_MAX_ELEMENTS_VERTICES, &caps.max_elements_vertices);
DoGetIntegerv(GL_MAX_FRAGMENT_INPUT_COMPONENTS,
@@ -3001,14 +3001,19 @@ Capabilities GLES2DecoderImpl::GetCapabilities() {
&caps.max_fragment_uniform_components);
DoGetIntegerv(GL_MAX_PROGRAM_TEXEL_OFFSET,
&caps.max_program_texel_offset);
- DoGetIntegerv(GL_MAX_SERVER_WAIT_TIMEOUT, &caps.max_server_wait_timeout);
+ DoGetInteger64v(GL_MAX_SERVER_WAIT_TIMEOUT, &caps.max_server_wait_timeout);
+ // Work around Linux NVIDIA driver bug where GL_TIMEOUT_IGNORED is
+ // returned.
+ if (caps.max_server_wait_timeout < 0)
+ caps.max_server_wait_timeout = 0;
piman 2015/05/19 00:13:41 Is 0 really better than GL_TIMEOUT_IGNORED which i
+ DoGetFloatv(GL_MAX_TEXTURE_LOD_BIAS, &caps.max_texture_lod_bias);
DoGetIntegerv(GL_MAX_TRANSFORM_FEEDBACK_INTERLEAVED_COMPONENTS,
&caps.max_transform_feedback_interleaved_components);
DoGetIntegerv(GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_ATTRIBS,
&caps.max_transform_feedback_separate_attribs);
DoGetIntegerv(GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_COMPONENTS,
&caps.max_transform_feedback_separate_components);
- DoGetIntegerv(GL_MAX_UNIFORM_BLOCK_SIZE, &caps.max_uniform_block_size);
+ DoGetInteger64v(GL_MAX_UNIFORM_BLOCK_SIZE, &caps.max_uniform_block_size);
DoGetIntegerv(GL_MAX_UNIFORM_BUFFER_BINDINGS,
&caps.max_uniform_buffer_bindings);
DoGetIntegerv(GL_MAX_VARYING_COMPONENTS, &caps.max_varying_components);
« no previous file with comments | « gpu/command_buffer/common/capabilities.cc ('k') | gpu/ipc/gpu_command_buffer_traits_multi.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698