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

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

Issue 1335243002: Improve Uniform*ui{v} command handling. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 3 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/service/program_manager.h ('k') | gpu/command_buffer/service/test_helper.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: gpu/command_buffer/service/program_manager.cc
diff --git a/gpu/command_buffer/service/program_manager.cc b/gpu/command_buffer/service/program_manager.cc
index f76bf1d9ba61e782759bd4ccc3df871fb9ec693c..2d8202d58f7f4199cbe69ef844bccf3e8c77db1a 100644
--- a/gpu/command_buffer/service/program_manager.cc
+++ b/gpu/command_buffer/service/program_manager.cc
@@ -144,17 +144,30 @@ Program::UniformInfo::UniformInfo(GLsizei _size,
accepts_api_type = kUniform4i;
break;
+ case GL_UNSIGNED_INT:
+ accepts_api_type = kUniform1ui;
+ break;
+ case GL_UNSIGNED_INT_VEC2:
+ accepts_api_type = kUniform2ui;
+ break;
+ case GL_UNSIGNED_INT_VEC3:
+ accepts_api_type = kUniform3ui;
+ break;
+ case GL_UNSIGNED_INT_VEC4:
+ accepts_api_type = kUniform4ui;
+ break;
+
case GL_BOOL:
- accepts_api_type = kUniform1i | kUniform1f;
+ accepts_api_type = kUniform1i | kUniform1ui | kUniform1f;
break;
case GL_BOOL_VEC2:
- accepts_api_type = kUniform2i | kUniform2f;
+ accepts_api_type = kUniform2i | kUniform2ui | kUniform2f;
break;
case GL_BOOL_VEC3:
- accepts_api_type = kUniform3i | kUniform3f;
+ accepts_api_type = kUniform3i | kUniform3ui | kUniform3f;
break;
case GL_BOOL_VEC4:
- accepts_api_type = kUniform4i | kUniform4f;
+ accepts_api_type = kUniform4i | kUniform4ui | kUniform4f;
break;
case GL_FLOAT:
@@ -185,8 +198,10 @@ Program::UniformInfo::UniformInfo(GLsizei _size,
case GL_SAMPLER_CUBE:
case GL_SAMPLER_3D_OES:
case GL_SAMPLER_EXTERNAL_OES:
+ case GL_SAMPLER_2D_ARRAY:
accepts_api_type = kUniform1i;
break;
+
default:
NOTREACHED() << "Unhandled UniformInfo type " << type;
break;
« no previous file with comments | « gpu/command_buffer/service/program_manager.h ('k') | gpu/command_buffer/service/test_helper.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698