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

Unified Diff: gpu/command_buffer/service/gles2_cmd_decoder_autogen.h

Issue 10568003: Add support for GL_CHROMIUM_consistent_uniform_locations (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 6 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
Index: gpu/command_buffer/service/gles2_cmd_decoder_autogen.h
diff --git a/gpu/command_buffer/service/gles2_cmd_decoder_autogen.h b/gpu/command_buffer/service/gles2_cmd_decoder_autogen.h
index cf8069b29d486ee5dfdd97f462343bef5f7b8ae2..edddf8ad019475e6feef091084e0c9f3dde44474 100644
--- a/gpu/command_buffer/service/gles2_cmd_decoder_autogen.h
+++ b/gpu/command_buffer/service/gles2_cmd_decoder_autogen.h
@@ -1757,7 +1757,7 @@ error::Error GLES2DecoderImpl::HandleTexParameterivImmediate(
error::Error GLES2DecoderImpl::HandleUniform1f(
uint32 immediate_data_size, const gles2::Uniform1f& c) {
- GLint location = program_manager()->UnswizzleLocation(
+ GLint location = GLES2Util::UnswizzleLocation(
static_cast<GLint>(c.location));
GLfloat x = static_cast<GLfloat>(c.x);
GLfloat temp[1] = { x, };
@@ -1767,7 +1767,7 @@ error::Error GLES2DecoderImpl::HandleUniform1f(
error::Error GLES2DecoderImpl::HandleUniform1fv(
uint32 immediate_data_size, const gles2::Uniform1fv& c) {
- GLint location = program_manager()->UnswizzleLocation(
+ GLint location = GLES2Util::UnswizzleLocation(
static_cast<GLint>(c.location));
GLsizei count = static_cast<GLsizei>(c.count);
uint32 data_size;
@@ -1785,7 +1785,7 @@ error::Error GLES2DecoderImpl::HandleUniform1fv(
error::Error GLES2DecoderImpl::HandleUniform1fvImmediate(
uint32 immediate_data_size, const gles2::Uniform1fvImmediate& c) {
- GLint location = program_manager()->UnswizzleLocation(
+ GLint location = GLES2Util::UnswizzleLocation(
static_cast<GLint>(c.location));
GLsizei count = static_cast<GLsizei>(c.count);
uint32 data_size;
@@ -1806,7 +1806,7 @@ error::Error GLES2DecoderImpl::HandleUniform1fvImmediate(
error::Error GLES2DecoderImpl::HandleUniform1i(
uint32 immediate_data_size, const gles2::Uniform1i& c) {
- GLint location = program_manager()->UnswizzleLocation(
+ GLint location = GLES2Util::UnswizzleLocation(
static_cast<GLint>(c.location));
GLint x = static_cast<GLint>(c.x);
DoUniform1i(location, x);
@@ -1815,7 +1815,7 @@ error::Error GLES2DecoderImpl::HandleUniform1i(
error::Error GLES2DecoderImpl::HandleUniform1iv(
uint32 immediate_data_size, const gles2::Uniform1iv& c) {
- GLint location = program_manager()->UnswizzleLocation(
+ GLint location = GLES2Util::UnswizzleLocation(
static_cast<GLint>(c.location));
GLsizei count = static_cast<GLsizei>(c.count);
uint32 data_size;
@@ -1833,7 +1833,7 @@ error::Error GLES2DecoderImpl::HandleUniform1iv(
error::Error GLES2DecoderImpl::HandleUniform1ivImmediate(
uint32 immediate_data_size, const gles2::Uniform1ivImmediate& c) {
- GLint location = program_manager()->UnswizzleLocation(
+ GLint location = GLES2Util::UnswizzleLocation(
static_cast<GLint>(c.location));
GLsizei count = static_cast<GLsizei>(c.count);
uint32 data_size;
@@ -1854,7 +1854,7 @@ error::Error GLES2DecoderImpl::HandleUniform1ivImmediate(
error::Error GLES2DecoderImpl::HandleUniform2f(
uint32 immediate_data_size, const gles2::Uniform2f& c) {
- GLint location = program_manager()->UnswizzleLocation(
+ GLint location = GLES2Util::UnswizzleLocation(
static_cast<GLint>(c.location));
GLfloat x = static_cast<GLfloat>(c.x);
GLfloat y = static_cast<GLfloat>(c.y);
@@ -1865,7 +1865,7 @@ error::Error GLES2DecoderImpl::HandleUniform2f(
error::Error GLES2DecoderImpl::HandleUniform2fv(
uint32 immediate_data_size, const gles2::Uniform2fv& c) {
- GLint location = program_manager()->UnswizzleLocation(
+ GLint location = GLES2Util::UnswizzleLocation(
static_cast<GLint>(c.location));
GLsizei count = static_cast<GLsizei>(c.count);
uint32 data_size;
@@ -1883,7 +1883,7 @@ error::Error GLES2DecoderImpl::HandleUniform2fv(
error::Error GLES2DecoderImpl::HandleUniform2fvImmediate(
uint32 immediate_data_size, const gles2::Uniform2fvImmediate& c) {
- GLint location = program_manager()->UnswizzleLocation(
+ GLint location = GLES2Util::UnswizzleLocation(
static_cast<GLint>(c.location));
GLsizei count = static_cast<GLsizei>(c.count);
uint32 data_size;
@@ -1904,7 +1904,7 @@ error::Error GLES2DecoderImpl::HandleUniform2fvImmediate(
error::Error GLES2DecoderImpl::HandleUniform2i(
uint32 immediate_data_size, const gles2::Uniform2i& c) {
- GLint location = program_manager()->UnswizzleLocation(
+ GLint location = GLES2Util::UnswizzleLocation(
static_cast<GLint>(c.location));
GLint x = static_cast<GLint>(c.x);
GLint y = static_cast<GLint>(c.y);
@@ -1915,7 +1915,7 @@ error::Error GLES2DecoderImpl::HandleUniform2i(
error::Error GLES2DecoderImpl::HandleUniform2iv(
uint32 immediate_data_size, const gles2::Uniform2iv& c) {
- GLint location = program_manager()->UnswizzleLocation(
+ GLint location = GLES2Util::UnswizzleLocation(
static_cast<GLint>(c.location));
GLsizei count = static_cast<GLsizei>(c.count);
uint32 data_size;
@@ -1933,7 +1933,7 @@ error::Error GLES2DecoderImpl::HandleUniform2iv(
error::Error GLES2DecoderImpl::HandleUniform2ivImmediate(
uint32 immediate_data_size, const gles2::Uniform2ivImmediate& c) {
- GLint location = program_manager()->UnswizzleLocation(
+ GLint location = GLES2Util::UnswizzleLocation(
static_cast<GLint>(c.location));
GLsizei count = static_cast<GLsizei>(c.count);
uint32 data_size;
@@ -1954,7 +1954,7 @@ error::Error GLES2DecoderImpl::HandleUniform2ivImmediate(
error::Error GLES2DecoderImpl::HandleUniform3f(
uint32 immediate_data_size, const gles2::Uniform3f& c) {
- GLint location = program_manager()->UnswizzleLocation(
+ GLint location = GLES2Util::UnswizzleLocation(
static_cast<GLint>(c.location));
GLfloat x = static_cast<GLfloat>(c.x);
GLfloat y = static_cast<GLfloat>(c.y);
@@ -1966,7 +1966,7 @@ error::Error GLES2DecoderImpl::HandleUniform3f(
error::Error GLES2DecoderImpl::HandleUniform3fv(
uint32 immediate_data_size, const gles2::Uniform3fv& c) {
- GLint location = program_manager()->UnswizzleLocation(
+ GLint location = GLES2Util::UnswizzleLocation(
static_cast<GLint>(c.location));
GLsizei count = static_cast<GLsizei>(c.count);
uint32 data_size;
@@ -1984,7 +1984,7 @@ error::Error GLES2DecoderImpl::HandleUniform3fv(
error::Error GLES2DecoderImpl::HandleUniform3fvImmediate(
uint32 immediate_data_size, const gles2::Uniform3fvImmediate& c) {
- GLint location = program_manager()->UnswizzleLocation(
+ GLint location = GLES2Util::UnswizzleLocation(
static_cast<GLint>(c.location));
GLsizei count = static_cast<GLsizei>(c.count);
uint32 data_size;
@@ -2005,7 +2005,7 @@ error::Error GLES2DecoderImpl::HandleUniform3fvImmediate(
error::Error GLES2DecoderImpl::HandleUniform3i(
uint32 immediate_data_size, const gles2::Uniform3i& c) {
- GLint location = program_manager()->UnswizzleLocation(
+ GLint location = GLES2Util::UnswizzleLocation(
static_cast<GLint>(c.location));
GLint x = static_cast<GLint>(c.x);
GLint y = static_cast<GLint>(c.y);
@@ -2017,7 +2017,7 @@ error::Error GLES2DecoderImpl::HandleUniform3i(
error::Error GLES2DecoderImpl::HandleUniform3iv(
uint32 immediate_data_size, const gles2::Uniform3iv& c) {
- GLint location = program_manager()->UnswizzleLocation(
+ GLint location = GLES2Util::UnswizzleLocation(
static_cast<GLint>(c.location));
GLsizei count = static_cast<GLsizei>(c.count);
uint32 data_size;
@@ -2035,7 +2035,7 @@ error::Error GLES2DecoderImpl::HandleUniform3iv(
error::Error GLES2DecoderImpl::HandleUniform3ivImmediate(
uint32 immediate_data_size, const gles2::Uniform3ivImmediate& c) {
- GLint location = program_manager()->UnswizzleLocation(
+ GLint location = GLES2Util::UnswizzleLocation(
static_cast<GLint>(c.location));
GLsizei count = static_cast<GLsizei>(c.count);
uint32 data_size;
@@ -2056,7 +2056,7 @@ error::Error GLES2DecoderImpl::HandleUniform3ivImmediate(
error::Error GLES2DecoderImpl::HandleUniform4f(
uint32 immediate_data_size, const gles2::Uniform4f& c) {
- GLint location = program_manager()->UnswizzleLocation(
+ GLint location = GLES2Util::UnswizzleLocation(
static_cast<GLint>(c.location));
GLfloat x = static_cast<GLfloat>(c.x);
GLfloat y = static_cast<GLfloat>(c.y);
@@ -2069,7 +2069,7 @@ error::Error GLES2DecoderImpl::HandleUniform4f(
error::Error GLES2DecoderImpl::HandleUniform4fv(
uint32 immediate_data_size, const gles2::Uniform4fv& c) {
- GLint location = program_manager()->UnswizzleLocation(
+ GLint location = GLES2Util::UnswizzleLocation(
static_cast<GLint>(c.location));
GLsizei count = static_cast<GLsizei>(c.count);
uint32 data_size;
@@ -2087,7 +2087,7 @@ error::Error GLES2DecoderImpl::HandleUniform4fv(
error::Error GLES2DecoderImpl::HandleUniform4fvImmediate(
uint32 immediate_data_size, const gles2::Uniform4fvImmediate& c) {
- GLint location = program_manager()->UnswizzleLocation(
+ GLint location = GLES2Util::UnswizzleLocation(
static_cast<GLint>(c.location));
GLsizei count = static_cast<GLsizei>(c.count);
uint32 data_size;
@@ -2108,7 +2108,7 @@ error::Error GLES2DecoderImpl::HandleUniform4fvImmediate(
error::Error GLES2DecoderImpl::HandleUniform4i(
uint32 immediate_data_size, const gles2::Uniform4i& c) {
- GLint location = program_manager()->UnswizzleLocation(
+ GLint location = GLES2Util::UnswizzleLocation(
static_cast<GLint>(c.location));
GLint x = static_cast<GLint>(c.x);
GLint y = static_cast<GLint>(c.y);
@@ -2121,7 +2121,7 @@ error::Error GLES2DecoderImpl::HandleUniform4i(
error::Error GLES2DecoderImpl::HandleUniform4iv(
uint32 immediate_data_size, const gles2::Uniform4iv& c) {
- GLint location = program_manager()->UnswizzleLocation(
+ GLint location = GLES2Util::UnswizzleLocation(
static_cast<GLint>(c.location));
GLsizei count = static_cast<GLsizei>(c.count);
uint32 data_size;
@@ -2139,7 +2139,7 @@ error::Error GLES2DecoderImpl::HandleUniform4iv(
error::Error GLES2DecoderImpl::HandleUniform4ivImmediate(
uint32 immediate_data_size, const gles2::Uniform4ivImmediate& c) {
- GLint location = program_manager()->UnswizzleLocation(
+ GLint location = GLES2Util::UnswizzleLocation(
static_cast<GLint>(c.location));
GLsizei count = static_cast<GLsizei>(c.count);
uint32 data_size;
@@ -2160,7 +2160,7 @@ error::Error GLES2DecoderImpl::HandleUniform4ivImmediate(
error::Error GLES2DecoderImpl::HandleUniformMatrix2fv(
uint32 immediate_data_size, const gles2::UniformMatrix2fv& c) {
- GLint location = program_manager()->UnswizzleLocation(
+ GLint location = GLES2Util::UnswizzleLocation(
static_cast<GLint>(c.location));
GLsizei count = static_cast<GLsizei>(c.count);
GLboolean transpose = static_cast<GLboolean>(c.transpose);
@@ -2184,7 +2184,7 @@ error::Error GLES2DecoderImpl::HandleUniformMatrix2fv(
error::Error GLES2DecoderImpl::HandleUniformMatrix2fvImmediate(
uint32 immediate_data_size, const gles2::UniformMatrix2fvImmediate& c) {
- GLint location = program_manager()->UnswizzleLocation(
+ GLint location = GLES2Util::UnswizzleLocation(
static_cast<GLint>(c.location));
GLsizei count = static_cast<GLsizei>(c.count);
GLboolean transpose = static_cast<GLboolean>(c.transpose);
@@ -2211,7 +2211,7 @@ error::Error GLES2DecoderImpl::HandleUniformMatrix2fvImmediate(
error::Error GLES2DecoderImpl::HandleUniformMatrix3fv(
uint32 immediate_data_size, const gles2::UniformMatrix3fv& c) {
- GLint location = program_manager()->UnswizzleLocation(
+ GLint location = GLES2Util::UnswizzleLocation(
static_cast<GLint>(c.location));
GLsizei count = static_cast<GLsizei>(c.count);
GLboolean transpose = static_cast<GLboolean>(c.transpose);
@@ -2235,7 +2235,7 @@ error::Error GLES2DecoderImpl::HandleUniformMatrix3fv(
error::Error GLES2DecoderImpl::HandleUniformMatrix3fvImmediate(
uint32 immediate_data_size, const gles2::UniformMatrix3fvImmediate& c) {
- GLint location = program_manager()->UnswizzleLocation(
+ GLint location = GLES2Util::UnswizzleLocation(
static_cast<GLint>(c.location));
GLsizei count = static_cast<GLsizei>(c.count);
GLboolean transpose = static_cast<GLboolean>(c.transpose);
@@ -2262,7 +2262,7 @@ error::Error GLES2DecoderImpl::HandleUniformMatrix3fvImmediate(
error::Error GLES2DecoderImpl::HandleUniformMatrix4fv(
uint32 immediate_data_size, const gles2::UniformMatrix4fv& c) {
- GLint location = program_manager()->UnswizzleLocation(
+ GLint location = GLES2Util::UnswizzleLocation(
static_cast<GLint>(c.location));
GLsizei count = static_cast<GLsizei>(c.count);
GLboolean transpose = static_cast<GLboolean>(c.transpose);
@@ -2286,7 +2286,7 @@ error::Error GLES2DecoderImpl::HandleUniformMatrix4fv(
error::Error GLES2DecoderImpl::HandleUniformMatrix4fvImmediate(
uint32 immediate_data_size, const gles2::UniformMatrix4fvImmediate& c) {
- GLint location = program_manager()->UnswizzleLocation(
+ GLint location = GLES2Util::UnswizzleLocation(
static_cast<GLint>(c.location));
GLsizei count = static_cast<GLsizei>(c.count);
GLboolean transpose = static_cast<GLboolean>(c.transpose);
« no previous file with comments | « gpu/command_buffer/service/gles2_cmd_decoder.cc ('k') | gpu/command_buffer/service/gles2_cmd_decoder_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698