Remove excess dereferences and casts.

The behaviour of dereferencing an array on the stack is the same as simply using the array but it is counter-intuitive, error prone and requires a cast to fit the required type. Change-Id: Ib14e902293cf6dc71aaf944d57f53ea895a680ab Reviewed-on: https://chromium-review.googlesource.com/188875Tested-by: Geoff Lang <geofflang@chromium.org> Reviewed-by: Shannon Woods <shannonwoods@chromium.org>

Remove excess dereferences and casts.
3b3ad1fe · Geoff Lang · 98705b7d · 3b3ad1fe
Commit 3b3ad1fe authored Mar 05, 2014 by Geoff Lang
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 7 deletions

libGLESv2.cpp src/libGLESv2/libGLESv2.cpp +7 -7

No files found.
--- a/src/libGLESv2/libGLESv2.cpp
+++ b/src/libGLESv2/libGLESv2.cpp
@@ -5253,7 +5253,7 @@ void __stdcall glUniform2f(GLint location, GLfloat x, GLfloat y)
 {
    GLfloat xy[2] = {x, y};
-    glUniform2fv(location, 1, (GLfloat*)&xy);
+    glUniform2fv(location, 1, xy);
 }
 void __stdcall glUniform2fv(GLint location, GLsizei count, const GLfloat* v)
@@ -5296,9 +5296,9 @@ void __stdcall glUniform2fv(GLint location, GLsizei count, const GLfloat* v)
 void __stdcall glUniform2i(GLint location, GLint x, GLint y)
 {
-    GLint xy[4] = {x, y};
+    GLint xy[2] = {x, y};
-    glUniform2iv(location, 1, (GLint*)&xy);
+    glUniform2iv(location, 1, xy);
 }
 void __stdcall glUniform2iv(GLint location, GLsizei count, const GLint* v)
@@ -5343,7 +5343,7 @@ void __stdcall glUniform3f(GLint location, GLfloat x, GLfloat y, GLfloat z)
 {
    GLfloat xyz[3] = {x, y, z};
-    glUniform3fv(location, 1, (GLfloat*)&xyz);
+    glUniform3fv(location, 1, xyz);
 }
 void __stdcall glUniform3fv(GLint location, GLsizei count, const GLfloat* v)
@@ -5388,7 +5388,7 @@ void __stdcall glUniform3i(GLint location, GLint x, GLint y, GLint z)
 {
    GLint xyz[3] = {x, y, z};
-    glUniform3iv(location, 1, (GLint*)&xyz);
+    glUniform3iv(location, 1, xyz);
 }
 void __stdcall glUniform3iv(GLint location, GLsizei count, const GLint* v)
@@ -5433,7 +5433,7 @@ void __stdcall glUniform4f(GLint location, GLfloat x, GLfloat y, GLfloat z, GLfl
 {
    GLfloat xyzw[4] = {x, y, z, w};
-    glUniform4fv(location, 1, (GLfloat*)&xyzw);
+    glUniform4fv(location, 1, xyzw);
 }
 void __stdcall glUniform4fv(GLint location, GLsizei count, const GLfloat* v)
@@ -5478,7 +5478,7 @@ void __stdcall glUniform4i(GLint location, GLint x, GLint y, GLint z, GLint w)
 {
    GLint xyzw[4] = {x, y, z, w};
-    glUniform4iv(location, 1, (GLint*)&xyzw);
+    glUniform4iv(location, 1, xyzw);
 }
 void __stdcall glUniform4iv(GLint location, GLsizei count, const GLint* v)