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

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

Issue 10635011: Add glBindUniformLocationCHROMIUM (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 edddf8ad019475e6feef091084e0c9f3dde44474..ab06503c2d0591707e35a0c50d6abd4afc470d42 100644
--- a/gpu/command_buffer/service/gles2_cmd_decoder_autogen.h
+++ b/gpu/command_buffer/service/gles2_cmd_decoder_autogen.h
@@ -1757,8 +1757,7 @@ error::Error GLES2DecoderImpl::HandleTexParameterivImmediate(
error::Error GLES2DecoderImpl::HandleUniform1f(
uint32 immediate_data_size, const gles2::Uniform1f& c) {
- GLint location = GLES2Util::UnswizzleLocation(
- static_cast<GLint>(c.location));
+ GLint location = static_cast<GLint>(c.location);
GLfloat x = static_cast<GLfloat>(c.x);
GLfloat temp[1] = { x, };
DoUniform1fv(location, 1, &temp[0]);
@@ -1767,8 +1766,7 @@ error::Error GLES2DecoderImpl::HandleUniform1f(
error::Error GLES2DecoderImpl::HandleUniform1fv(
uint32 immediate_data_size, const gles2::Uniform1fv& c) {
- GLint location = GLES2Util::UnswizzleLocation(
- static_cast<GLint>(c.location));
+ GLint location = static_cast<GLint>(c.location);
GLsizei count = static_cast<GLsizei>(c.count);
uint32 data_size;
if (!ComputeDataSize(count, sizeof(GLfloat), 1, &data_size)) {
@@ -1785,8 +1783,7 @@ error::Error GLES2DecoderImpl::HandleUniform1fv(
error::Error GLES2DecoderImpl::HandleUniform1fvImmediate(
uint32 immediate_data_size, const gles2::Uniform1fvImmediate& c) {
- GLint location = GLES2Util::UnswizzleLocation(
- static_cast<GLint>(c.location));
+ GLint location = static_cast<GLint>(c.location);
GLsizei count = static_cast<GLsizei>(c.count);
uint32 data_size;
if (!ComputeDataSize(count, sizeof(GLfloat), 1, &data_size)) {
@@ -1806,8 +1803,7 @@ error::Error GLES2DecoderImpl::HandleUniform1fvImmediate(
error::Error GLES2DecoderImpl::HandleUniform1i(
uint32 immediate_data_size, const gles2::Uniform1i& c) {
- GLint location = GLES2Util::UnswizzleLocation(
- static_cast<GLint>(c.location));
+ GLint location = static_cast<GLint>(c.location);
GLint x = static_cast<GLint>(c.x);
DoUniform1i(location, x);
return error::kNoError;
@@ -1815,8 +1811,7 @@ error::Error GLES2DecoderImpl::HandleUniform1i(
error::Error GLES2DecoderImpl::HandleUniform1iv(
uint32 immediate_data_size, const gles2::Uniform1iv& c) {
- GLint location = GLES2Util::UnswizzleLocation(
- static_cast<GLint>(c.location));
+ GLint location = static_cast<GLint>(c.location);
GLsizei count = static_cast<GLsizei>(c.count);
uint32 data_size;
if (!ComputeDataSize(count, sizeof(GLint), 1, &data_size)) {
@@ -1833,8 +1828,7 @@ error::Error GLES2DecoderImpl::HandleUniform1iv(
error::Error GLES2DecoderImpl::HandleUniform1ivImmediate(
uint32 immediate_data_size, const gles2::Uniform1ivImmediate& c) {
- GLint location = GLES2Util::UnswizzleLocation(
- static_cast<GLint>(c.location));
+ GLint location = static_cast<GLint>(c.location);
GLsizei count = static_cast<GLsizei>(c.count);
uint32 data_size;
if (!ComputeDataSize(count, sizeof(GLint), 1, &data_size)) {
@@ -1854,8 +1848,7 @@ error::Error GLES2DecoderImpl::HandleUniform1ivImmediate(
error::Error GLES2DecoderImpl::HandleUniform2f(
uint32 immediate_data_size, const gles2::Uniform2f& c) {
- GLint location = GLES2Util::UnswizzleLocation(
- static_cast<GLint>(c.location));
+ GLint location = static_cast<GLint>(c.location);
GLfloat x = static_cast<GLfloat>(c.x);
GLfloat y = static_cast<GLfloat>(c.y);
GLfloat temp[2] = { x, y, };
@@ -1865,8 +1858,7 @@ error::Error GLES2DecoderImpl::HandleUniform2f(
error::Error GLES2DecoderImpl::HandleUniform2fv(
uint32 immediate_data_size, const gles2::Uniform2fv& c) {
- GLint location = GLES2Util::UnswizzleLocation(
- static_cast<GLint>(c.location));
+ GLint location = static_cast<GLint>(c.location);
GLsizei count = static_cast<GLsizei>(c.count);
uint32 data_size;
if (!ComputeDataSize(count, sizeof(GLfloat), 2, &data_size)) {
@@ -1883,8 +1875,7 @@ error::Error GLES2DecoderImpl::HandleUniform2fv(
error::Error GLES2DecoderImpl::HandleUniform2fvImmediate(
uint32 immediate_data_size, const gles2::Uniform2fvImmediate& c) {
- GLint location = GLES2Util::UnswizzleLocation(
- static_cast<GLint>(c.location));
+ GLint location = static_cast<GLint>(c.location);
GLsizei count = static_cast<GLsizei>(c.count);
uint32 data_size;
if (!ComputeDataSize(count, sizeof(GLfloat), 2, &data_size)) {
@@ -1904,8 +1895,7 @@ error::Error GLES2DecoderImpl::HandleUniform2fvImmediate(
error::Error GLES2DecoderImpl::HandleUniform2i(
uint32 immediate_data_size, const gles2::Uniform2i& c) {
- GLint location = GLES2Util::UnswizzleLocation(
- static_cast<GLint>(c.location));
+ GLint location = static_cast<GLint>(c.location);
GLint x = static_cast<GLint>(c.x);
GLint y = static_cast<GLint>(c.y);
GLint temp[2] = { x, y, };
@@ -1915,8 +1905,7 @@ error::Error GLES2DecoderImpl::HandleUniform2i(
error::Error GLES2DecoderImpl::HandleUniform2iv(
uint32 immediate_data_size, const gles2::Uniform2iv& c) {
- GLint location = GLES2Util::UnswizzleLocation(
- static_cast<GLint>(c.location));
+ GLint location = static_cast<GLint>(c.location);
GLsizei count = static_cast<GLsizei>(c.count);
uint32 data_size;
if (!ComputeDataSize(count, sizeof(GLint), 2, &data_size)) {
@@ -1933,8 +1922,7 @@ error::Error GLES2DecoderImpl::HandleUniform2iv(
error::Error GLES2DecoderImpl::HandleUniform2ivImmediate(
uint32 immediate_data_size, const gles2::Uniform2ivImmediate& c) {
- GLint location = GLES2Util::UnswizzleLocation(
- static_cast<GLint>(c.location));
+ GLint location = static_cast<GLint>(c.location);
GLsizei count = static_cast<GLsizei>(c.count);
uint32 data_size;
if (!ComputeDataSize(count, sizeof(GLint), 2, &data_size)) {
@@ -1954,8 +1942,7 @@ error::Error GLES2DecoderImpl::HandleUniform2ivImmediate(
error::Error GLES2DecoderImpl::HandleUniform3f(
uint32 immediate_data_size, const gles2::Uniform3f& c) {
- GLint location = GLES2Util::UnswizzleLocation(
- static_cast<GLint>(c.location));
+ GLint location = static_cast<GLint>(c.location);
GLfloat x = static_cast<GLfloat>(c.x);
GLfloat y = static_cast<GLfloat>(c.y);
GLfloat z = static_cast<GLfloat>(c.z);
@@ -1966,8 +1953,7 @@ error::Error GLES2DecoderImpl::HandleUniform3f(
error::Error GLES2DecoderImpl::HandleUniform3fv(
uint32 immediate_data_size, const gles2::Uniform3fv& c) {
- GLint location = GLES2Util::UnswizzleLocation(
- static_cast<GLint>(c.location));
+ GLint location = static_cast<GLint>(c.location);
GLsizei count = static_cast<GLsizei>(c.count);
uint32 data_size;
if (!ComputeDataSize(count, sizeof(GLfloat), 3, &data_size)) {
@@ -1984,8 +1970,7 @@ error::Error GLES2DecoderImpl::HandleUniform3fv(
error::Error GLES2DecoderImpl::HandleUniform3fvImmediate(
uint32 immediate_data_size, const gles2::Uniform3fvImmediate& c) {
- GLint location = GLES2Util::UnswizzleLocation(
- static_cast<GLint>(c.location));
+ GLint location = static_cast<GLint>(c.location);
GLsizei count = static_cast<GLsizei>(c.count);
uint32 data_size;
if (!ComputeDataSize(count, sizeof(GLfloat), 3, &data_size)) {
@@ -2005,8 +1990,7 @@ error::Error GLES2DecoderImpl::HandleUniform3fvImmediate(
error::Error GLES2DecoderImpl::HandleUniform3i(
uint32 immediate_data_size, const gles2::Uniform3i& c) {
- GLint location = GLES2Util::UnswizzleLocation(
- static_cast<GLint>(c.location));
+ GLint location = static_cast<GLint>(c.location);
GLint x = static_cast<GLint>(c.x);
GLint y = static_cast<GLint>(c.y);
GLint z = static_cast<GLint>(c.z);
@@ -2017,8 +2001,7 @@ error::Error GLES2DecoderImpl::HandleUniform3i(
error::Error GLES2DecoderImpl::HandleUniform3iv(
uint32 immediate_data_size, const gles2::Uniform3iv& c) {
- GLint location = GLES2Util::UnswizzleLocation(
- static_cast<GLint>(c.location));
+ GLint location = static_cast<GLint>(c.location);
GLsizei count = static_cast<GLsizei>(c.count);
uint32 data_size;
if (!ComputeDataSize(count, sizeof(GLint), 3, &data_size)) {
@@ -2035,8 +2018,7 @@ error::Error GLES2DecoderImpl::HandleUniform3iv(
error::Error GLES2DecoderImpl::HandleUniform3ivImmediate(
uint32 immediate_data_size, const gles2::Uniform3ivImmediate& c) {
- GLint location = GLES2Util::UnswizzleLocation(
- static_cast<GLint>(c.location));
+ GLint location = static_cast<GLint>(c.location);
GLsizei count = static_cast<GLsizei>(c.count);
uint32 data_size;
if (!ComputeDataSize(count, sizeof(GLint), 3, &data_size)) {
@@ -2056,8 +2038,7 @@ error::Error GLES2DecoderImpl::HandleUniform3ivImmediate(
error::Error GLES2DecoderImpl::HandleUniform4f(
uint32 immediate_data_size, const gles2::Uniform4f& c) {
- GLint location = GLES2Util::UnswizzleLocation(
- static_cast<GLint>(c.location));
+ GLint location = static_cast<GLint>(c.location);
GLfloat x = static_cast<GLfloat>(c.x);
GLfloat y = static_cast<GLfloat>(c.y);
GLfloat z = static_cast<GLfloat>(c.z);
@@ -2069,8 +2050,7 @@ error::Error GLES2DecoderImpl::HandleUniform4f(
error::Error GLES2DecoderImpl::HandleUniform4fv(
uint32 immediate_data_size, const gles2::Uniform4fv& c) {
- GLint location = GLES2Util::UnswizzleLocation(
- static_cast<GLint>(c.location));
+ GLint location = static_cast<GLint>(c.location);
GLsizei count = static_cast<GLsizei>(c.count);
uint32 data_size;
if (!ComputeDataSize(count, sizeof(GLfloat), 4, &data_size)) {
@@ -2087,8 +2067,7 @@ error::Error GLES2DecoderImpl::HandleUniform4fv(
error::Error GLES2DecoderImpl::HandleUniform4fvImmediate(
uint32 immediate_data_size, const gles2::Uniform4fvImmediate& c) {
- GLint location = GLES2Util::UnswizzleLocation(
- static_cast<GLint>(c.location));
+ GLint location = static_cast<GLint>(c.location);
GLsizei count = static_cast<GLsizei>(c.count);
uint32 data_size;
if (!ComputeDataSize(count, sizeof(GLfloat), 4, &data_size)) {
@@ -2108,8 +2087,7 @@ error::Error GLES2DecoderImpl::HandleUniform4fvImmediate(
error::Error GLES2DecoderImpl::HandleUniform4i(
uint32 immediate_data_size, const gles2::Uniform4i& c) {
- GLint location = GLES2Util::UnswizzleLocation(
- static_cast<GLint>(c.location));
+ GLint location = static_cast<GLint>(c.location);
GLint x = static_cast<GLint>(c.x);
GLint y = static_cast<GLint>(c.y);
GLint z = static_cast<GLint>(c.z);
@@ -2121,8 +2099,7 @@ error::Error GLES2DecoderImpl::HandleUniform4i(
error::Error GLES2DecoderImpl::HandleUniform4iv(
uint32 immediate_data_size, const gles2::Uniform4iv& c) {
- GLint location = GLES2Util::UnswizzleLocation(
- static_cast<GLint>(c.location));
+ GLint location = static_cast<GLint>(c.location);
GLsizei count = static_cast<GLsizei>(c.count);
uint32 data_size;
if (!ComputeDataSize(count, sizeof(GLint), 4, &data_size)) {
@@ -2139,8 +2116,7 @@ error::Error GLES2DecoderImpl::HandleUniform4iv(
error::Error GLES2DecoderImpl::HandleUniform4ivImmediate(
uint32 immediate_data_size, const gles2::Uniform4ivImmediate& c) {
- GLint location = GLES2Util::UnswizzleLocation(
- static_cast<GLint>(c.location));
+ GLint location = static_cast<GLint>(c.location);
GLsizei count = static_cast<GLsizei>(c.count);
uint32 data_size;
if (!ComputeDataSize(count, sizeof(GLint), 4, &data_size)) {
@@ -2160,8 +2136,7 @@ error::Error GLES2DecoderImpl::HandleUniform4ivImmediate(
error::Error GLES2DecoderImpl::HandleUniformMatrix2fv(
uint32 immediate_data_size, const gles2::UniformMatrix2fv& c) {
- GLint location = GLES2Util::UnswizzleLocation(
- static_cast<GLint>(c.location));
+ GLint location = static_cast<GLint>(c.location);
GLsizei count = static_cast<GLsizei>(c.count);
GLboolean transpose = static_cast<GLboolean>(c.transpose);
uint32 data_size;
@@ -2184,8 +2159,7 @@ error::Error GLES2DecoderImpl::HandleUniformMatrix2fv(
error::Error GLES2DecoderImpl::HandleUniformMatrix2fvImmediate(
uint32 immediate_data_size, const gles2::UniformMatrix2fvImmediate& c) {
- GLint location = GLES2Util::UnswizzleLocation(
- static_cast<GLint>(c.location));
+ GLint location = static_cast<GLint>(c.location);
GLsizei count = static_cast<GLsizei>(c.count);
GLboolean transpose = static_cast<GLboolean>(c.transpose);
uint32 data_size;
@@ -2211,8 +2185,7 @@ error::Error GLES2DecoderImpl::HandleUniformMatrix2fvImmediate(
error::Error GLES2DecoderImpl::HandleUniformMatrix3fv(
uint32 immediate_data_size, const gles2::UniformMatrix3fv& c) {
- GLint location = GLES2Util::UnswizzleLocation(
- static_cast<GLint>(c.location));
+ GLint location = static_cast<GLint>(c.location);
GLsizei count = static_cast<GLsizei>(c.count);
GLboolean transpose = static_cast<GLboolean>(c.transpose);
uint32 data_size;
@@ -2235,8 +2208,7 @@ error::Error GLES2DecoderImpl::HandleUniformMatrix3fv(
error::Error GLES2DecoderImpl::HandleUniformMatrix3fvImmediate(
uint32 immediate_data_size, const gles2::UniformMatrix3fvImmediate& c) {
- GLint location = GLES2Util::UnswizzleLocation(
- static_cast<GLint>(c.location));
+ GLint location = static_cast<GLint>(c.location);
GLsizei count = static_cast<GLsizei>(c.count);
GLboolean transpose = static_cast<GLboolean>(c.transpose);
uint32 data_size;
@@ -2262,8 +2234,7 @@ error::Error GLES2DecoderImpl::HandleUniformMatrix3fvImmediate(
error::Error GLES2DecoderImpl::HandleUniformMatrix4fv(
uint32 immediate_data_size, const gles2::UniformMatrix4fv& c) {
- GLint location = GLES2Util::UnswizzleLocation(
- static_cast<GLint>(c.location));
+ GLint location = static_cast<GLint>(c.location);
GLsizei count = static_cast<GLsizei>(c.count);
GLboolean transpose = static_cast<GLboolean>(c.transpose);
uint32 data_size;
@@ -2286,8 +2257,7 @@ error::Error GLES2DecoderImpl::HandleUniformMatrix4fv(
error::Error GLES2DecoderImpl::HandleUniformMatrix4fvImmediate(
uint32 immediate_data_size, const gles2::UniformMatrix4fvImmediate& c) {
- GLint location = GLES2Util::UnswizzleLocation(
- static_cast<GLint>(c.location));
+ GLint location = static_cast<GLint>(c.location);
GLsizei count = static_cast<GLsizei>(c.count);
GLboolean transpose = static_cast<GLboolean>(c.transpose);
uint32 data_size;
« 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