From d63a23dd06b9fc2533a7ac701af2e0c47d8c63d4 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Sat, 31 May 2014 21:23:53 +0200 Subject: [PATCH] Header changes --- frontend/menu/menu_common.h | 4 ++++ gfx/shader_parse.h | 11 +++++++++++ 2 files changed, 15 insertions(+) diff --git a/frontend/menu/menu_common.h b/frontend/menu/menu_common.h index b9b0e273c3..c97ea81a40 100644 --- a/frontend/menu/menu_common.h +++ b/frontend/menu/menu_common.h @@ -32,7 +32,11 @@ #include "../../input/keyboard_line.h" #if defined(HAVE_CG) || defined(HAVE_HLSL) || defined(HAVE_GLSL) + +#ifndef HAVE_SHADER_MANAGER #define HAVE_SHADER_MANAGER +#endif + #include "../../gfx/shader_parse.h" #endif diff --git a/gfx/shader_parse.h b/gfx/shader_parse.h index 53e1c11f67..379347adb4 100644 --- a/gfx/shader_parse.h +++ b/gfx/shader_parse.h @@ -24,10 +24,21 @@ extern "C" { #endif +#ifndef GFX_MAX_SHADERS #define GFX_MAX_SHADERS 16 +#endif + +#ifndef GFX_MAX_TEXTURES #define GFX_MAX_TEXTURES 8 +#endif + +#ifndef GFX_MAX_VARIABLES #define GFX_MAX_VARIABLES 64 +#endif + +#ifndef GFX_MAX_PARAMETERS #define GFX_MAX_PARAMETERS 64 +#endif enum gfx_scale_type {