fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-21 22:20:14 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

gallium: remove helpers converting to/from TGSI_PROCESSOR_*

Browse source 
Acked-by: Jose Fonseca <jfonseca@vmware.com>
This commit is contained in:
Marek Olšák 2016-04-16 14:48:34 +02:00
parent af249a7da9
commit c9e5a7df61
4 changed files with 3 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/gallium/auxiliary/tgsi/tgsi_ureg.c
View file

@ -2090,8 +2090,7 @@ ureg_create_with_screen(unsigned processor, struct pipe_screen *screen)
ureg->processor = processor; ureg->processor = processor;
ureg->supports_any_inout_decl_range = ureg->supports_any_inout_decl_range =
screen && screen &&
screen->get_shader_param(screen, screen->get_shader_param(screen, processor,
util_pipe_shader_from_tgsi_processor(processor),
PIPE_SHADER_CAP_TGSI_ANY_INOUT_DECL_RANGE) != 0; PIPE_SHADER_CAP_TGSI_ANY_INOUT_DECL_RANGE) != 0;
ureg->next_shader_processor = -1; ureg->next_shader_processor = -1;

22
src/gallium/auxiliary/util/u_inlines.h
View file

@ -650,28 +650,6 @@ util_max_layer(const struct pipe_resource *r, unsigned level)
} }
} }
static inline unsigned
util_pipe_shader_from_tgsi_processor(unsigned processor)
{
switch (processor) {
case PIPE_SHADER_VERTEX:
return PIPE_SHADER_VERTEX;
case PIPE_SHADER_TESS_CTRL:
return PIPE_SHADER_TESS_CTRL;
case PIPE_SHADER_TESS_EVAL:
return PIPE_SHADER_TESS_EVAL;
case PIPE_SHADER_GEOMETRY:
return PIPE_SHADER_GEOMETRY;
case PIPE_SHADER_FRAGMENT:
return PIPE_SHADER_FRAGMENT;
case PIPE_SHADER_COMPUTE:
return PIPE_SHADER_COMPUTE;
default:
assert(0);
return PIPE_SHADER_VERTEX;
}
}
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif

2
src/gallium/drivers/radeonsi/si_state_shaders.c
View file

@ -1037,7 +1037,7 @@ static void *si_create_shader_selector(struct pipe_context *ctx,
sel->so = state->stream_output; sel->so = state->stream_output;
tgsi_scan_shader(state->tokens, &sel->info); tgsi_scan_shader(state->tokens, &sel->info);
sel->type = util_pipe_shader_from_tgsi_processor(sel->info.processor); sel->type = sel->info.processor;
p_atomic_inc(&sscreen->b.num_shaders_created); p_atomic_inc(&sscreen->b.num_shaders_created);
/* Set which opcode uses which (i,j) pair. */ /* Set which opcode uses which (i,j) pair. */

13
src/gallium/state_trackers/nine/nine_shader.c
View file

@ -3254,17 +3254,6 @@ tx_dtor(struct shader_translator *tx)
FREE(tx); FREE(tx);
} }
static inline unsigned
tgsi_processor_from_type(unsigned shader_type)
{
switch (shader_type) {
case PIPE_SHADER_VERTEX: return PIPE_SHADER_VERTEX;
case PIPE_SHADER_FRAGMENT: return PIPE_SHADER_FRAGMENT;
default:
return ~0;
}
}
static void static void
shader_add_ps_fog_stage(struct shader_translator *tx, struct ureg_src src_col) shader_add_ps_fog_stage(struct shader_translator *tx, struct ureg_src src_col)
{ {
@ -3326,7 +3315,7 @@ nine_translate_shader(struct NineDevice9 *device, struct nine_shader_info *info)
{ {
struct shader_translator *tx; struct shader_translator *tx;
HRESULT hr = D3D_OK; HRESULT hr = D3D_OK;
const unsigned processor = tgsi_processor_from_type(info->type); const unsigned processor = info->type;
unsigned s, slot_max; unsigned s, slot_max;
unsigned max_const_f; unsigned max_const_f;