summaryrefslogtreecommitdiffstatshomepage
path: root/src/osd/sdl
diff options
context:
space:
mode:
author Aaron Giles <aaron@aarongiles.com>2012-09-16 03:06:55 +0000
committer Aaron Giles <aaron@aarongiles.com>2012-09-16 03:06:55 +0000
commit91f928d6cd774c9526c7fde7e0860aded24d08a5 (patch)
tree7f41fdb9da8c9de744c08094820eb47c6b21576b /src/osd/sdl
parent8d1de4e030e6af94e1bb6c1cbeedb8ca8a18d5b1 (diff)
Enum and union normalization.
Diffstat (limited to 'src/osd/sdl')
-rw-r--r--src/osd/sdl/gl_shader_mgr.h8
-rw-r--r--src/osd/sdl/gl_shader_tool.h4
2 files changed, 6 insertions, 6 deletions
diff --git a/src/osd/sdl/gl_shader_mgr.h b/src/osd/sdl/gl_shader_mgr.h
index 595e0a68e49..2bb37888845 100644
--- a/src/osd/sdl/gl_shader_mgr.h
+++ b/src/osd/sdl/gl_shader_mgr.h
@@ -4,20 +4,20 @@
// #define GLSL_SOURCE_ON_DISK 1
-typedef enum {
+enum GLSL_SHADER_TYPE {
GLSL_SHADER_TYPE_IDX16,
GLSL_SHADER_TYPE_RGB32_LUT,
GLSL_SHADER_TYPE_RGB32_DIRECT,
GLSL_SHADER_TYPE_NUMBER
-} GLSL_SHADER_TYPE;
+};
-typedef enum {
+enum GLSL_SHADER_FEATURE {
GLSL_SHADER_FEAT_PLAIN,
GLSL_SHADER_FEAT_BILINEAR,
GLSL_SHADER_FEAT_INT_NUMBER,
GLSL_SHADER_FEAT_CUSTOM = GLSL_SHADER_FEAT_INT_NUMBER,
GLSL_SHADER_FEAT_MAX_NUMBER,
-} GLSL_SHADER_FEATURE;
+};
// old code passed sdl_info * to functions here
// however the parameter was not used
diff --git a/src/osd/sdl/gl_shader_tool.h b/src/osd/sdl/gl_shader_tool.h
index dd59906ae1e..84174a40d7f 100644
--- a/src/osd/sdl/gl_shader_tool.h
+++ b/src/osd/sdl/gl_shader_tool.h
@@ -73,11 +73,11 @@ typedef void * (APIENTRYP PFNGLGETPROCADDRESSOS)(const char *procName);
*/
int gl_shader_loadExtention(PFNGLGETPROCADDRESSOS GetProcAddress);
-typedef enum {
+enum GLSLCheckMode {
CHECK_QUIET, /* just return 0, if no error, otherwise the GL error code, no stderr output */
CHECK_VERBOSE, /* same as CHECK_QUIET, but in the case of an error, use stderr to be verbose */
CHECK_ALWAYS_VERBOSE /* always print out all information available */
-} GLSLCheckMode;
+};
#define GL_CHECK_ERROR_VERBOSE() gl_check_error(CHECK_ALWAYS_VERBOSE,__FILE__,__LINE__)
#define GL_CHECK_ERROR_NORMAL() gl_check_error(CHECK_VERBOSE,__FILE__,__LINE__)