Mesa (master): glsl: Copy _mesa_shader_type_to_index() to standalone scaffolding.

Kenneth Graunke kwg at kemper.freedesktop.org
Mon May 13 06:38:38 UTC 2013


Module: Mesa
Branch: master
Commit: 1c95cea40b518166bfa8d6925d58adf4e73d74fa
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=1c95cea40b518166bfa8d6925d58adf4e73d74fa

Author: Kenneth Graunke <kenneth at whitecape.org>
Date:   Wed Apr 17 17:30:20 2013 -0700

glsl: Copy _mesa_shader_type_to_index() to standalone scaffolding.

We can't include shaderobj.h from the standalone utilities, so we
unfortunately have to copy this function.

Signed-off-by: Kenneth Graunke <kenneth at whitecape.org>
Reviewed-by: Ian Romanick <ian.d.romanick at intel.com>
Reviewed-by: Eric Anholt <eric at anholt.net>

---

 src/glsl/standalone_scaffolding.h |   17 +++++++++++++++++
 1 files changed, 17 insertions(+), 0 deletions(-)

diff --git a/src/glsl/standalone_scaffolding.h b/src/glsl/standalone_scaffolding.h
index 0a2cde8..7afb1c3 100644
--- a/src/glsl/standalone_scaffolding.h
+++ b/src/glsl/standalone_scaffolding.h
@@ -31,6 +31,7 @@
 #ifndef STANDALONE_SCAFFOLDING_H
 #define STANDALONE_SCAFFOLDING_H
 
+#include <assert.h>
 #include "main/mtypes.h"
 
 extern "C" void
@@ -47,6 +48,22 @@ extern "C" void
 _mesa_shader_debug(struct gl_context *ctx, GLenum type, GLuint *id,
                    const char *msg, int len);
 
+static inline gl_shader_type
+_mesa_shader_type_to_index(GLenum v)
+{
+   switch (v) {
+   case GL_VERTEX_SHADER:
+      return MESA_SHADER_VERTEX;
+   case GL_FRAGMENT_SHADER:
+      return MESA_SHADER_FRAGMENT;
+   case GL_GEOMETRY_SHADER:
+      return MESA_SHADER_GEOMETRY;
+   default:
+      assert(!"bad value in _mesa_shader_type_to_index()");
+      return MESA_SHADER_TYPES;
+   }
+}
+
 /**
  * Initialize the given gl_context structure to a reasonable set of
  * defaults representing the minimum capabilities required by the




More information about the mesa-commit mailing list