[Piglit] [PATCH 2/2] piglit: fix some warnings about no return value from non-void function

Brian Paul brianp at vmware.com
Fri Mar 16 19:38:04 UTC 2018


---
 tests/spec/arb_texture_multisample/large-float-texture.c | 1 +
 tests/spec/arb_vertex_program/property-bindings.c        | 4 +++-
 tests/spec/glsl-1.10/execution/built-in-uniform-state.c  | 4 +++-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/tests/spec/arb_texture_multisample/large-float-texture.c b/tests/spec/arb_texture_multisample/large-float-texture.c
index 2e05a6e..bbec551 100644
--- a/tests/spec/arb_texture_multisample/large-float-texture.c
+++ b/tests/spec/arb_texture_multisample/large-float-texture.c
@@ -456,6 +456,7 @@ texel_size(GLenum intFormat)
 		return 4 * sizeof(GLfloat);
 	default:
 		assert(!"Unexpected texture format");
+		return 0;
 	}
 }
 
diff --git a/tests/spec/arb_vertex_program/property-bindings.c b/tests/spec/arb_vertex_program/property-bindings.c
index f1a2b28..381ecab 100644
--- a/tests/spec/arb_vertex_program/property-bindings.c
+++ b/tests/spec/arb_vertex_program/property-bindings.c
@@ -158,8 +158,10 @@ enum2program(const GLenum pname)
 		return "r";
 	case GL_Q:
 		return "q";
+	default:
+		assert(!"unexpected state enum");
+		return "";
 	}
-	assert(!"unexpected state enum");
 }
 
 enum piglit_result
diff --git a/tests/spec/glsl-1.10/execution/built-in-uniform-state.c b/tests/spec/glsl-1.10/execution/built-in-uniform-state.c
index ca7a3cf..5ab5ee8 100644
--- a/tests/spec/glsl-1.10/execution/built-in-uniform-state.c
+++ b/tests/spec/glsl-1.10/execution/built-in-uniform-state.c
@@ -191,8 +191,10 @@ enum2glsl(const GLenum pname)
 		return "R";
 	case GL_Q:
 		return "Q";
+	default:
+		assert(!"unexpected pname");
+		return "";
 	}
-	assert(0);
 }
 
 enum piglit_result
-- 
2.7.4



More information about the Piglit mailing list