diff options
author | Eric Anholt <[email protected]> | 2013-11-13 13:41:28 -0800 |
---|---|---|
committer | Eric Anholt <[email protected]> | 2013-11-15 11:34:59 -0800 |
commit | bb1f0969756fbb827c4b2520c632daa15342b064 (patch) | |
tree | 11655aa90b64a15c47f561681b5c72ab690c9dfc /src/mesa/program | |
parent | 33b0455211019988fe418cca5dfac62c7902c861 (diff) |
mesa: Remove PROGRAM_ENV_PARAM enum.
This has been replaced with referring to env parameters using
PROGRAM_STATE_VAR and _mesa_load_state_parameters.
Reviewed-by: Brian Paul <[email protected]>
Reviewed-by: Ian Romanick <[email protected]>
Diffstat (limited to 'src/mesa/program')
-rw-r--r-- | src/mesa/program/prog_execute.c | 5 | ||||
-rw-r--r-- | src/mesa/program/prog_print.c | 5 | ||||
-rw-r--r-- | src/mesa/program/program.c | 3 |
3 files changed, 0 insertions, 13 deletions
diff --git a/src/mesa/program/prog_execute.c b/src/mesa/program/prog_execute.c index 4a6414747b4..115525eba57 100644 --- a/src/mesa/program/prog_execute.c +++ b/src/mesa/program/prog_execute.c @@ -118,11 +118,6 @@ get_src_register_pointer(const struct prog_src_register *source, return ZeroVec; return machine->Outputs[reg]; - case PROGRAM_ENV_PARAM: - if (reg >= MAX_PROGRAM_ENV_PARAMS) - return ZeroVec; - return machine->EnvParams[reg]; - case PROGRAM_STATE_VAR: /* Fallthrough */ case PROGRAM_CONSTANT: diff --git a/src/mesa/program/prog_print.c b/src/mesa/program/prog_print.c index e503cb62bb6..fa120cc5e3a 100644 --- a/src/mesa/program/prog_print.c +++ b/src/mesa/program/prog_print.c @@ -50,8 +50,6 @@ _mesa_register_file_name(gl_register_file f) switch (f) { case PROGRAM_TEMPORARY: return "TEMP"; - case PROGRAM_ENV_PARAM: - return "ENV"; case PROGRAM_STATE_VAR: return "STATE"; case PROGRAM_INPUT: @@ -380,9 +378,6 @@ reg_string(gl_register_file f, GLint index, gl_prog_print_mode mode, case PROGRAM_TEMPORARY: sprintf(str, "temp%d", index); break; - case PROGRAM_ENV_PARAM: - sprintf(str, "program.env[%s%d]", addr, index); - break; case PROGRAM_CONSTANT: /* extension */ sprintf(str, "constant[%s%d]", addr, index); break; diff --git a/src/mesa/program/program.c b/src/mesa/program/program.c index e8bb7d7ff5f..b7b5140adc5 100644 --- a/src/mesa/program/program.c +++ b/src/mesa/program/program.c @@ -909,9 +909,6 @@ _mesa_valid_register_index(const struct gl_context *ctx, case PROGRAM_TEMPORARY: return index >= 0 && index < (GLint) c->MaxTemps; - case PROGRAM_ENV_PARAM: - return index >= 0 && index < (GLint) c->MaxEnvParams; - case PROGRAM_UNIFORM: case PROGRAM_STATE_VAR: /* aka constant buffer */ |