Commit cde52771 authored by Paul Berry's avatar Paul Berry
Browse files

glsl-max-varyings: Clean up max_varyings misnomer.



In glsl-max-varyings' draw() function, the parameter max_varyings
actually represented the number of varyings to test, not the maximum.
Renamed to num_varyings, in accordance with the name of this parameter
in get_vs() and get_fs().
Reviewed-by: Emma Anholt's avatarEric Anholt <eric@anholt.net>
parent 7dbd5595
...@@ -140,7 +140,7 @@ coord_from_index(int index) ...@@ -140,7 +140,7 @@ coord_from_index(int index)
} }
static void static void
draw(int max_varyings) draw(int num_varyings)
{ {
int data_varying; int data_varying;
float green[4][4] = { {0.0, 1.0, 0.0, 0.0}, float green[4][4] = { {0.0, 1.0, 0.0, 0.0},
...@@ -159,12 +159,12 @@ draw(int max_varyings) ...@@ -159,12 +159,12 @@ draw(int max_varyings)
glEnableVertexAttribArray(1); glEnableVertexAttribArray(1);
glEnableVertexAttribArray(2); glEnableVertexAttribArray(2);
for (data_varying = 0; data_varying < max_varyings; data_varying++) { for (data_varying = 0; data_varying < num_varyings; data_varying++) {
GLuint prog, vs, fs; GLuint prog, vs, fs;
GLint loc; GLint loc;
vs = get_vs(max_varyings, data_varying); vs = get_vs(num_varyings, data_varying);
fs = get_fs(max_varyings, data_varying); fs = get_fs(num_varyings, data_varying);
prog = glCreateProgram(); prog = glCreateProgram();
glAttachShader(prog, vs); glAttachShader(prog, vs);
...@@ -180,7 +180,7 @@ draw(int max_varyings) ...@@ -180,7 +180,7 @@ draw(int max_varyings)
glUseProgram(prog); glUseProgram(prog);
loc = glGetUniformLocation(prog, "zero"); loc = glGetUniformLocation(prog, "zero");
if (loc != -1) /* not used for max_varyings == 1 */ if (loc != -1) /* not used for num_varyings == 1 */
glUniform1f(loc, 0.0); glUniform1f(loc, 0.0);
loc = glGetUniformLocation(prog, "one"); loc = glGetUniformLocation(prog, "one");
...@@ -188,7 +188,7 @@ draw(int max_varyings) ...@@ -188,7 +188,7 @@ draw(int max_varyings)
glUniform1f(loc, 1.0); glUniform1f(loc, 1.0);
piglit_draw_rect(coord_from_index(data_varying), piglit_draw_rect(coord_from_index(data_varying),
coord_from_index(max_varyings - 1), coord_from_index(num_varyings - 1),
10, 10,
10); 10);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment