Mesa (master): main: Move MESA_SHADER_TYPES outside of gl_shader_type enum.

Paul Berry stereotype441 at kemper.freedesktop.org
Tue Dec 17 21:17:33 UTC 2013


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

Author: Paul Berry <stereotype441 at gmail.com>
Date:   Mon Dec 16 13:05:09 2013 -0800

main: Move MESA_SHADER_TYPES outside of gl_shader_type enum.

This will avoid spurious compiler warnings in the patch that follows.

Reviewed-by: Brian Paul <brianp at vmware.com>

---

 src/mesa/main/mtypes.h |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h
index f7e1391..534c3bc 100644
--- a/src/mesa/main/mtypes.h
+++ b/src/mesa/main/mtypes.h
@@ -2399,9 +2399,10 @@ typedef enum
    MESA_SHADER_VERTEX = 0,
    MESA_SHADER_GEOMETRY = 1,
    MESA_SHADER_FRAGMENT = 2,
-   MESA_SHADER_TYPES = 3
 } gl_shader_type;
 
+#define MESA_SHADER_TYPES (MESA_SHADER_FRAGMENT + 1)
+
 
 struct gl_uniform_buffer_variable
 {




More information about the mesa-commit mailing list