From 95536339cf9882a475d5ac67ac83693ff7486c14 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Alexis=20Laferri=C3=A8re?= Date: Wed, 30 Sep 2015 23:12:04 -0400 Subject: [PATCH 1/1] lib/glesv2 & gamnit: update examples MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Alexis Laferrière --- .../examples/triangle/src/portable_triangle.nit | 20 ++++++++++---------- .../examples/triangle/src/standalone_triangle.nit | 20 ++++++++++---------- lib/glesv2/examples/opengles2_hello_triangle.nit | 8 ++++---- 3 files changed, 24 insertions(+), 24 deletions(-) diff --git a/lib/gamnit/examples/triangle/src/portable_triangle.nit b/lib/gamnit/examples/triangle/src/portable_triangle.nit index 624ec47..8903c9c 100644 --- a/lib/gamnit/examples/triangle/src/portable_triangle.nit +++ b/lib/gamnit/examples/triangle/src/portable_triangle.nit @@ -49,17 +49,17 @@ redef class App print "Width: {display.width}" print "Height: {display.height}" - assert_no_gl_error + assert glGetError == gl_NO_ERROR assert gl.shader_compiler else print "Cannot compile shaders" # GL program program = new GLProgram if not glIsProgram(program) then print "Program is not ok: {glGetError.to_s}\nLog:" - print program.info_log + print glGetProgramInfoLog(program) abort end - assert_no_gl_error + assert glGetError == gl_NO_ERROR # Vertex shader vertex_shader = new GLVertexShader @@ -72,8 +72,8 @@ redef class App } """@glsl_vertex_shader.to_cstring) glCompileShader(vertex_shader) - assert vertex_shader.is_compiled else print "Vertex shader compilation failed with: {vertex_shader.info_log} {program.info_log}" - assert_no_gl_error + assert vertex_shader.is_compiled else print "Vertex shader compilation failed with: {glGetShaderInfoLog(vertex_shader)} {glGetProgramInfoLog(program)}" + assert glGetError == gl_NO_ERROR # Fragment shader fragment_shader = new GLFragmentShader @@ -86,16 +86,16 @@ redef class App } """@glsl_fragment_shader.to_cstring) glCompileShader(fragment_shader) - assert fragment_shader.is_compiled else print "Fragment shader compilation failed with: {fragment_shader.info_log}" - assert_no_gl_error + assert fragment_shader.is_compiled else print "Fragment shader compilation failed with: {glIsShader(fragment_shader)}" + assert glGetError == gl_NO_ERROR # Attach to program glAttachShader(program, vertex_shader) glAttachShader(program, fragment_shader) program.bind_attrib_location(0, "vPosition") glLinkProgram program - assert program.is_linked else print "Linking failed: {program.info_log}" - assert_no_gl_error + assert program.is_linked else print "Linking failed: {glGetProgramInfoLog(program)}" + assert glGetError == gl_NO_ERROR # Draw! var vertices = [0.0, 0.5, 0.0, -0.5, -0.5, 0.0, 0.5, -0.5, 0.0] @@ -111,7 +111,7 @@ redef class App if display != null then glClearColor(t, t, t, 1.0) - assert_no_gl_error + assert glGetError == gl_NO_ERROR glViewport(0, 0, display.width, display.height) glClear gl_COLOR_BUFFER_BIT glUseProgram program diff --git a/lib/gamnit/examples/triangle/src/standalone_triangle.nit b/lib/gamnit/examples/triangle/src/standalone_triangle.nit index 209597f..9840d15 100644 --- a/lib/gamnit/examples/triangle/src/standalone_triangle.nit +++ b/lib/gamnit/examples/triangle/src/standalone_triangle.nit @@ -36,7 +36,7 @@ print "Width: {width}" print "Height: {height}" # Custom calls to OpenGL ES 2.0 -assert_no_gl_error +assert glGetError == gl_NO_ERROR assert gl.shader_compiler else print "Cannot compile shaders" # GL program @@ -44,10 +44,10 @@ print glGetError.to_s var program = new GLProgram if not glIsProgram(program) then print "Program is not ok: {glGetError.to_s}\nLog:" - print program.info_log + print glGetProgramInfoLog(program) abort end -assert_no_gl_error +assert glGetError == gl_NO_ERROR # Vertex shader var vertex_shader = new GLVertexShader @@ -60,8 +60,8 @@ void main() } """@glsl_vertex_shader.to_cstring) glCompileShader vertex_shader -assert vertex_shader.is_compiled else print "Vertex shader compilation failed with: {vertex_shader.info_log} {program.info_log}" -assert_no_gl_error +assert vertex_shader.is_compiled else print "Vertex shader compilation failed with: {glGetShaderInfoLog(vertex_shader)} {glGetProgramInfoLog(program)}" +assert glGetError == gl_NO_ERROR # Fragment shader var fragment_shader = new GLFragmentShader @@ -74,16 +74,16 @@ void main() } """@glsl_fragment_shader.to_cstring) glIsShader fragment_shader -assert fragment_shader.is_compiled else print "Fragment shader compilation failed with: {fragment_shader.info_log}" -assert_no_gl_error +assert fragment_shader.is_compiled else print "Fragment shader compilation failed with: {glGetShaderInfoLog(fragment_shader)}" +assert glGetError == gl_NO_ERROR # Attach to program glAttachShader(program, vertex_shader) glAttachShader(program, fragment_shader) program.bind_attrib_location(0, "vPosition") glLinkProgram program -assert program.is_linked else print "Linking failed: {program.info_log}" -assert_no_gl_error +assert program.is_linked else print "Linking failed: {glGetProgramInfoLog(program)}" +assert glGetError == gl_NO_ERROR # Draw! var vertices = [0.0, 0.5, 0.0, -0.5, -0.5, 0.0, 0.5, -0.5, 0.0] @@ -92,7 +92,7 @@ vertex_array.attrib_pointer glClearColor(0.5, 0.0, 0.5, 1.0) for i in [0..1000[ do printn "." - assert_no_gl_error + assert glGetError == gl_NO_ERROR glViewport(0, 0, width, height) glClear gl_COLOR_BUFFER_BIT glUseProgram program diff --git a/lib/glesv2/examples/opengles2_hello_triangle.nit b/lib/glesv2/examples/opengles2_hello_triangle.nit index 340c307..abf21b3 100644 --- a/lib/glesv2/examples/opengles2_hello_triangle.nit +++ b/lib/glesv2/examples/opengles2_hello_triangle.nit @@ -116,7 +116,7 @@ print glGetError.to_s var program = new GLProgram if not glIsProgram(program) then print "Program is not ok: {glGetError.to_s}\nLog:" - print program.info_log + print glGetProgramInfoLog(program) abort end assert_no_gl_error @@ -132,7 +132,7 @@ void main() } """.to_cstring) glCompileShader vertex_shader -assert vertex_shader.is_compiled else print "Vertex shader compilation failed with: {vertex_shader.info_log} {program.info_log}" +assert vertex_shader.is_compiled else print "Vertex shader compilation failed with: {glGetShaderInfoLog(vertex_shader)} {glGetProgramInfoLog(program)}" assert_no_gl_error # fragment shader @@ -146,14 +146,14 @@ void main() } """.to_cstring) glCompileShader(fragment_shader) -assert fragment_shader.is_compiled else print "Fragment shader compilation failed with: {fragment_shader.info_log}" +assert fragment_shader.is_compiled else print "Fragment shader compilation failed with: {glGetShaderInfoLog(fragment_shader)}" assert_no_gl_error glAttachShader(program, vertex_shader) glAttachShader(program, fragment_shader) program.bind_attrib_location(0, "vPosition") glLinkProgram program -assert program.is_linked else print "Linking failed: {program.info_log}" +assert program.is_linked else print "Linking failed: {glGetProgramInfoLog(program)}" assert_no_gl_error # draw! -- 1.7.9.5