diff options
| author | Brian Paul <[email protected]> | 2008-11-24 14:08:58 -0700 |
|---|---|---|
| committer | Brian Paul <[email protected]> | 2008-11-24 14:08:58 -0700 |
| commit | df6155fcff66034457b3165f5df0a61ccfc41314 (patch) | |
| tree | 533a3edc14a84d654ce5dd1f2eb305a42a138991 /src/mesa/main | |
| parent | 868c607c1751fc3e6df1a8dc45e8b70e6bc315f6 (diff) | |
| parent | b730d0d3e9b202b17a0815cb820fc9905f35cb98 (diff) | |
Merge commit 'origin/master' into gallium-0.2
Conflicts:
progs/glsl/Makefile
Diffstat (limited to 'src/mesa/main')
| -rw-r--r-- | src/mesa/main/config.h | 2 | ||||
| -rw-r--r-- | src/mesa/main/mtypes.h | 3 |
2 files changed, 5 insertions, 0 deletions
diff --git a/src/mesa/main/config.h b/src/mesa/main/config.h index 3b340c476c2..e29964a1e86 100644 --- a/src/mesa/main/config.h +++ b/src/mesa/main/config.h @@ -191,6 +191,8 @@ #define MAX_UNIFORMS 128 /**< number of float components */ #define MAX_VARYING 8 /**< number of float[4] vectors */ #define MAX_SAMPLERS 8 +#define MAX_PROGRAM_INPUTS 32 +#define MAX_PROGRAM_OUTPUTS 32 /*@}*/ /** For GL_NV_vertex_program */ diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h index 5e920f7aeb1..556b4ed0164 100644 --- a/src/mesa/main/mtypes.h +++ b/src/mesa/main/mtypes.h @@ -1874,10 +1874,13 @@ struct gl_program GLbitfield InputsRead; /**< Bitmask of which input regs are read */ GLbitfield OutputsWritten; /**< Bitmask of which output regs are written to */ + GLbitfield InputFlags[MAX_PROGRAM_INPUTS]; /**< PROG_PARAM_BIT_x flags */ + GLbitfield OutputFlags[MAX_PROGRAM_OUTPUTS]; /**< PROG_PARAM_BIT_x flags */ GLbitfield TexturesUsed[MAX_TEXTURE_IMAGE_UNITS]; /**< TEXTURE_x_BIT bitmask */ GLbitfield SamplersUsed; /**< Bitfield of which samplers are used */ GLbitfield ShadowSamplers; /**< Texture units used for shadow sampling. */ + /** Named parameters, constants, etc. from program text */ struct gl_program_parameter_list *Parameters; /** Numbered local parameters */ |