diff options
| author | Marek Olšák <[email protected]> | 2017-06-11 01:32:19 +0200 |
|---|---|---|
| committer | Marek Olšák <[email protected]> | 2017-06-22 01:51:02 +0200 |
| commit | 4c0bce921bb7cf440703c0a93f66589fef7d429b (patch) | |
| tree | 1db9c6ac0633e197750af42ebac4b9492778a2ed /src | |
| parent | c9a16fde807aa6b054758d0e0b62f802096e20dd (diff) | |
st/mesa: don't call st_shader_stage_to_ptarget in update_textures
Reviewed-by: Nicolai Hähnle <[email protected]>
Diffstat (limited to 'src')
| -rw-r--r-- | src/mesa/state_tracker/st_atom_texture.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/src/mesa/state_tracker/st_atom_texture.c b/src/mesa/state_tracker/st_atom_texture.c index f9d726a6091..6e986d2ffb5 100644 --- a/src/mesa/state_tracker/st_atom_texture.c +++ b/src/mesa/state_tracker/st_atom_texture.c @@ -104,7 +104,7 @@ st_update_single_texture(struct st_context *st, static void update_textures(struct st_context *st, - gl_shader_stage mesa_shader, + enum pipe_shader_type shader_stage, const struct gl_program *prog, unsigned max_units, struct pipe_sampler_view **sampler_views, @@ -115,7 +115,6 @@ update_textures(struct st_context *st, GLbitfield free_slots = ~prog->SamplersUsed; GLbitfield external_samplers_used = prog->ExternalSamplersUsed; GLuint unit; - enum pipe_shader_type shader_stage = st_shader_stage_to_ptarget(mesa_shader); if (samplers_used == 0x0 && old_max == 0) return; @@ -209,7 +208,7 @@ st_update_vertex_textures(struct st_context *st) if (ctx->Const.Program[MESA_SHADER_VERTEX].MaxTextureImageUnits > 0) { update_textures(st, - MESA_SHADER_VERTEX, + PIPE_SHADER_VERTEX, ctx->VertexProgram._Current, ctx->Const.Program[MESA_SHADER_VERTEX].MaxTextureImageUnits, st->state.sampler_views[PIPE_SHADER_VERTEX], @@ -224,7 +223,7 @@ st_update_fragment_textures(struct st_context *st) const struct gl_context *ctx = st->ctx; update_textures(st, - MESA_SHADER_FRAGMENT, + PIPE_SHADER_FRAGMENT, ctx->FragmentProgram._Current, ctx->Const.Program[MESA_SHADER_FRAGMENT].MaxTextureImageUnits, st->state.sampler_views[PIPE_SHADER_FRAGMENT], @@ -239,7 +238,7 @@ st_update_geometry_textures(struct st_context *st) if (ctx->GeometryProgram._Current) { update_textures(st, - MESA_SHADER_GEOMETRY, + PIPE_SHADER_GEOMETRY, ctx->GeometryProgram._Current, ctx->Const.Program[MESA_SHADER_GEOMETRY].MaxTextureImageUnits, st->state.sampler_views[PIPE_SHADER_GEOMETRY], @@ -255,7 +254,7 @@ st_update_tessctrl_textures(struct st_context *st) if (ctx->TessCtrlProgram._Current) { update_textures(st, - MESA_SHADER_TESS_CTRL, + PIPE_SHADER_TESS_CTRL, ctx->TessCtrlProgram._Current, ctx->Const.Program[MESA_SHADER_TESS_CTRL].MaxTextureImageUnits, st->state.sampler_views[PIPE_SHADER_TESS_CTRL], @@ -271,7 +270,7 @@ st_update_tesseval_textures(struct st_context *st) if (ctx->TessEvalProgram._Current) { update_textures(st, - MESA_SHADER_TESS_EVAL, + PIPE_SHADER_TESS_EVAL, ctx->TessEvalProgram._Current, ctx->Const.Program[MESA_SHADER_TESS_EVAL].MaxTextureImageUnits, st->state.sampler_views[PIPE_SHADER_TESS_EVAL], @@ -287,7 +286,7 @@ st_update_compute_textures(struct st_context *st) if (ctx->ComputeProgram._Current) { update_textures(st, - MESA_SHADER_COMPUTE, + PIPE_SHADER_COMPUTE, ctx->ComputeProgram._Current, ctx->Const.Program[MESA_SHADER_COMPUTE].MaxTextureImageUnits, st->state.sampler_views[PIPE_SHADER_COMPUTE], |