[Piglit] [PATCH 1/2] shader_runner: always enable VAO for gl >= 31

Jordan Justen jordan.l.justen at intel.com
Tue Jan 21 11:47:11 PST 2014


This fixes attributeless rendering on nvidia.

For example:
 * tests/spec/glsl-1.50/execution/geometry/point-size-out.shader_test

Signed-off-by: Jordan Justen <jordan.l.justen at intel.com>
---
 tests/shaders/shader_runner.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/tests/shaders/shader_runner.c b/tests/shaders/shader_runner.c
index 018b143..94e3ae4 100644
--- a/tests/shaders/shader_runner.c
+++ b/tests/shaders/shader_runner.c
@@ -2013,14 +2013,16 @@ piglit_init(int argc, char **argv)
 
 	process_test_script(argv[1]);
 	link_and_use_shaders();
-	if (link_ok && vertex_data_start != NULL) {
-		program_must_be_in_use();
+	if (link_ok) {
 		if (gl_version.num >= 31) {
 			GLuint vao;
 
 			glGenVertexArrays(1, &vao);
 			glBindVertexArray(vao);
 		}
+	}
+	if (link_ok && vertex_data_start != NULL) {
+		program_must_be_in_use();
 
 		num_vbo_rows = setup_vbo_from_text(prog, vertex_data_start,
 						   vertex_data_end);
-- 
1.8.5.3



More information about the Piglit mailing list