plug in GLSL 1.20 unit

This commit is contained in:
Brian
2007-04-09 19:04:45 -06:00
parent 19121e2802
commit 7b2626f7d8
2 changed files with 22 additions and 4 deletions
+18 -1
View File
@@ -1967,6 +1967,10 @@ static const byte slang_core_gc[] = {
#include "library/slang_core_gc.h"
};
static const byte slang_120_core_gc[] = {
#include "library/slang_120_core_gc.h"
};
static const byte slang_common_builtin_gc[] = {
#include "library/slang_common_builtin_gc.h"
};
@@ -2016,11 +2020,24 @@ compile_object(grammar * id, const char *source, slang_code_object * object,
NULL, NULL, NULL))
return GL_FALSE;
#if FEATURE_ARB_shading_language_120
if (!compile_binary(slang_120_core_gc,
&object->builtin[SLANG_BUILTIN_120_CORE],
SLANG_UNIT_FRAGMENT_BUILTIN, infolog,
NULL, &object->builtin[SLANG_BUILTIN_CORE], NULL))
return GL_FALSE;
#endif
/* compile common functions and variables, link to core */
if (!compile_binary(slang_common_builtin_gc,
&object->builtin[SLANG_BUILTIN_COMMON],
SLANG_UNIT_FRAGMENT_BUILTIN, infolog, NULL,
&object->builtin[SLANG_BUILTIN_CORE], NULL))
#if FEATURE_ARB_shading_language_120
&object->builtin[SLANG_BUILTIN_120_CORE],
#else
&object->builtin[SLANG_BUILTIN_CORE],
#endif
NULL))
return GL_FALSE;
/* compile target-specific functions and variables, link to common */
+4 -3
View File
@@ -69,10 +69,11 @@ extern GLvoid
_slang_code_unit_dtr (slang_code_unit *);
#define SLANG_BUILTIN_CORE 0
#define SLANG_BUILTIN_COMMON 1
#define SLANG_BUILTIN_TARGET 2
#define SLANG_BUILTIN_120_CORE 1
#define SLANG_BUILTIN_COMMON 2
#define SLANG_BUILTIN_TARGET 3
#define SLANG_BUILTIN_TOTAL 3
#define SLANG_BUILTIN_TOTAL 4
typedef struct slang_code_object_
{