diff options
| author | Timothy Arceri <[email protected]> | 2016-10-20 15:27:35 +1100 |
|---|---|---|
| committer | Timothy Arceri <[email protected]> | 2016-10-26 14:29:36 +1100 |
| commit | 5346630593bec80efa732c40b63e0e95a00af074 (patch) | |
| tree | c321e7220a3a7b08b2b70f86f84bcccbb5cbaba2 /src/mesa/main | |
| parent | b4b450a5cbd22690b221d0252e6d11f4c0e02ab8 (diff) | |
r200/glsl/st/mesa: use common outputs written field
And set outputs written directly in shader_info.
st/mesa changes where:
Reviewed-by: Marek Olšák <[email protected]>
Reviewed-by: Jason Ekstrand <[email protected]>
Diffstat (limited to 'src/mesa/main')
| -rw-r--r-- | src/mesa/main/context.c | 2 | ||||
| -rw-r--r-- | src/mesa/main/ff_fragment_shader.cpp | 2 | ||||
| -rw-r--r-- | src/mesa/main/ffvertex_prog.c | 4 | ||||
| -rw-r--r-- | src/mesa/main/mtypes.h | 1 |
4 files changed, 4 insertions, 5 deletions
diff --git a/src/mesa/main/context.c b/src/mesa/main/context.c index 65c1b6d0b38..5aaf150e019 100644 --- a/src/mesa/main/context.c +++ b/src/mesa/main/context.c @@ -741,7 +741,7 @@ check_context_limits(struct gl_context *ctx) /* check that we don't exceed the size of various bitfields */ assert(VARYING_SLOT_MAX <= - (8 * sizeof(ctx->VertexProgram._Current->OutputsWritten))); + (8 * sizeof(ctx->VertexProgram._Current->info.outputs_written))); assert(VARYING_SLOT_MAX <= (8 * sizeof(ctx->FragmentProgram._Current->info.inputs_read))); diff --git a/src/mesa/main/ff_fragment_shader.cpp b/src/mesa/main/ff_fragment_shader.cpp index 530033579e9..9aa1dc15cdc 100644 --- a/src/mesa/main/ff_fragment_shader.cpp +++ b/src/mesa/main/ff_fragment_shader.cpp @@ -370,7 +370,7 @@ static GLbitfield get_fp_input_mask( struct gl_context *ctx ) else vprog = ctx->VertexProgram.Current; - vp_outputs = vprog->OutputsWritten; + vp_outputs = vprog->info.outputs_written; /* These get generated in the setup routine regardless of the * vertex program: diff --git a/src/mesa/main/ffvertex_prog.c b/src/mesa/main/ffvertex_prog.c index 00409cc71df..8cec1cbaa60 100644 --- a/src/mesa/main/ffvertex_prog.c +++ b/src/mesa/main/ffvertex_prog.c @@ -461,7 +461,7 @@ static struct ureg register_input( struct tnl_program *p, GLuint input ) */ static struct ureg register_output( struct tnl_program *p, GLuint output ) { - p->program->OutputsWritten |= BITFIELD64_BIT(output); + p->program->info.outputs_written |= BITFIELD64_BIT(output); return make_ureg(PROGRAM_OUTPUT, output); } @@ -1640,7 +1640,7 @@ create_new_program( const struct state_key *key, p.program->NumAttributes = p.program->NumAddressRegs = 0; p.program->Parameters = _mesa_new_parameter_list(); p.program->info.inputs_read = 0; - p.program->OutputsWritten = 0; + p.program->info.outputs_written = 0; build_tnl_program( &p ); } diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h index 7283f44d3d3..0b8844c2165 100644 --- a/src/mesa/main/mtypes.h +++ b/src/mesa/main/mtypes.h @@ -1922,7 +1922,6 @@ struct gl_program struct shader_info info; - GLbitfield64 OutputsWritten; /**< Bitmask of which output regs are written */ GLbitfield64 SecondaryOutputsWritten; /**< Subset of OutputsWritten outputs written with non-zero index. */ GLbitfield64 OutputsRead; /**< Bitmask of which output regs are read */ GLbitfield PatchInputsRead; /**< VAR[0..31] usage for patch inputs (user-defined only) */ |