summaryrefslogtreecommitdiffstats
path: root/src/mesa/main/shaderobj.h
diff options
context:
space:
mode:
authorPaul Berry <stereotype441@gmail.com>2013-12-16 12:58:55 -0800
committerPaul Berry <stereotype441@gmail.com>2013-12-17 12:31:35 -0800
commitd9b55244fd56b5971b40fdadb262a25840197096 (patch)
treecd76e49c8857284982469da059e6fd582d8db1d9 /src/mesa/main/shaderobj.h
parent188630dc13b52ce9c64166da9a9df6a644b1599c (diff)
downloadexternal_mesa3d-d9b55244fd56b5971b40fdadb262a25840197096.zip
external_mesa3d-d9b55244fd56b5971b40fdadb262a25840197096.tar.gz
external_mesa3d-d9b55244fd56b5971b40fdadb262a25840197096.tar.bz2
glsl: Don't return bad values from _mesa_shader_type_to_index.
This will avoid compiler warnings in the patch that follows. There should be no user-visible effect because the change only affects the behaviour when an invalid enum is passed to _mesa_shader_type_to_index(), and that can only happen if there is a bug elsewhere in Mesa. Reviewed-by: Brian Paul <brianp@vmware.com>
Diffstat (limited to 'src/mesa/main/shaderobj.h')
-rw-r--r--src/mesa/main/shaderobj.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mesa/main/shaderobj.h b/src/mesa/main/shaderobj.h
index de1c9fc..aff178f 100644
--- a/src/mesa/main/shaderobj.h
+++ b/src/mesa/main/shaderobj.h
@@ -113,7 +113,7 @@ _mesa_shader_type_to_index(GLenum v)
return MESA_SHADER_GEOMETRY;
default:
ASSERT(0 && "bad value in _mesa_shader_type_to_index()");
- return MESA_SHADER_TYPES;
+ return MESA_SHADER_VERTEX;
}
}