gallium: s/unsigned/enum pipe_shader_type/ for pipe_screen::get_shader_param()

Reviewed-by: Edward O'Callaghan <funfunctor@folklore1984.net>
This commit is contained in:
Brian Paul 2017-03-05 12:13:02 -07:00
parent db5f9c3177
commit 637e5719b5
23 changed files with 62 additions and 29 deletions

View file

@ -1036,7 +1036,8 @@ draw_set_mapped_texture(struct draw_context *draw,
* different ways of setting textures, and drivers typically only support one.
*/
int
draw_get_shader_param_no_llvm(unsigned shader, enum pipe_shader_cap param)
draw_get_shader_param_no_llvm(enum pipe_shader_type shader,
enum pipe_shader_cap param)
{
switch(shader) {
case PIPE_SHADER_VERTEX:
@ -1054,7 +1055,7 @@ draw_get_shader_param_no_llvm(unsigned shader, enum pipe_shader_cap param)
* draw_get_shader_param_no_llvm instead.
*/
int
draw_get_shader_param(unsigned shader, enum pipe_shader_cap param)
draw_get_shader_param(enum pipe_shader_type shader, enum pipe_shader_cap param)
{
#ifdef HAVE_LLVM

View file

@ -299,10 +299,11 @@ boolean draw_need_pipeline(const struct draw_context *draw,
unsigned prim );
int
draw_get_shader_param(unsigned shader, enum pipe_shader_cap param);
draw_get_shader_param(enum pipe_shader_type shader, enum pipe_shader_cap param);
int
draw_get_shader_param_no_llvm(unsigned shader, enum pipe_shader_cap param);
draw_get_shader_param_no_llvm(enum pipe_shader_type shader,
enum pipe_shader_cap param);
boolean
draw_get_option_use_llvm(void);

View file

@ -458,7 +458,8 @@ pipe_transfer_unmap( struct pipe_context *context,
}
static inline void
pipe_set_constant_buffer(struct pipe_context *pipe, uint shader, uint index,
pipe_set_constant_buffer(struct pipe_context *pipe,
enum pipe_shader_type shader, uint index,
struct pipe_resource *buf)
{
if (buf) {

View file

@ -93,7 +93,8 @@ dd_screen_get_compute_param(struct pipe_screen *_screen,
}
static int
dd_screen_get_shader_param(struct pipe_screen *_screen, unsigned shader,
dd_screen_get_shader_param(struct pipe_screen *_screen,
enum pipe_shader_type shader,
enum pipe_shader_cap param)
{
struct pipe_screen *screen = dd_screen(_screen)->screen;

View file

@ -353,7 +353,8 @@ etna_screen_get_paramf(struct pipe_screen *pscreen, enum pipe_capf param)
}
static int
etna_screen_get_shader_param(struct pipe_screen *pscreen, unsigned shader,
etna_screen_get_shader_param(struct pipe_screen *pscreen,
enum pipe_shader_type shader,
enum pipe_shader_cap param)
{
struct etna_screen *screen = etna_screen(pscreen);

View file

@ -430,7 +430,8 @@ fd_screen_get_paramf(struct pipe_screen *pscreen, enum pipe_capf param)
}
static int
fd_screen_get_shader_param(struct pipe_screen *pscreen, unsigned shader,
fd_screen_get_shader_param(struct pipe_screen *pscreen,
enum pipe_shader_type shader,
enum pipe_shader_cap param)
{
struct fd_screen *screen = fd_screen(pscreen);

View file

@ -107,7 +107,9 @@ i915_get_name(struct pipe_screen *screen)
}
static int
i915_get_shader_param(struct pipe_screen *screen, unsigned shader, enum pipe_shader_cap cap)
i915_get_shader_param(struct pipe_screen *screen,
enum pipe_shader_type shader,
enum pipe_shader_cap cap)
{
switch(shader) {
case PIPE_SHADER_VERTEX:

View file

@ -354,7 +354,9 @@ llvmpipe_get_param(struct pipe_screen *screen, enum pipe_cap param)
}
static int
llvmpipe_get_shader_param(struct pipe_screen *screen, unsigned shader, enum pipe_shader_cap param)
llvmpipe_get_shader_param(struct pipe_screen *screen,
enum pipe_shader_type shader,
enum pipe_shader_cap param)
{
switch(shader)
{

View file

@ -391,7 +391,9 @@ static float noop_get_paramf(struct pipe_screen* pscreen,
return screen->get_paramf(screen, param);
}
static int noop_get_shader_param(struct pipe_screen* pscreen, unsigned shader, enum pipe_shader_cap param)
static int noop_get_shader_param(struct pipe_screen* pscreen,
enum pipe_shader_type shader,
enum pipe_shader_cap param)
{
struct pipe_screen *screen = ((struct noop_pipe_screen*)pscreen)->oscreen;

View file

@ -258,7 +258,8 @@ nv30_screen_get_paramf(struct pipe_screen *pscreen, enum pipe_capf param)
}
static int
nv30_screen_get_shader_param(struct pipe_screen *pscreen, unsigned shader,
nv30_screen_get_shader_param(struct pipe_screen *pscreen,
enum pipe_shader_type shader,
enum pipe_shader_cap param)
{
struct nv30_screen *screen = nv30_screen(pscreen);

View file

@ -287,7 +287,8 @@ nv50_screen_get_param(struct pipe_screen *pscreen, enum pipe_cap param)
}
static int
nv50_screen_get_shader_param(struct pipe_screen *pscreen, unsigned shader,
nv50_screen_get_shader_param(struct pipe_screen *pscreen,
enum pipe_shader_type shader,
enum pipe_shader_cap param)
{
switch (shader) {

View file

@ -309,7 +309,8 @@ nvc0_screen_get_param(struct pipe_screen *pscreen, enum pipe_cap param)
}
static int
nvc0_screen_get_shader_param(struct pipe_screen *pscreen, unsigned shader,
nvc0_screen_get_shader_param(struct pipe_screen *pscreen,
enum pipe_shader_type shader,
enum pipe_shader_cap param)
{
const uint16_t class_3d = nouveau_screen(pscreen)->class_3d;

View file

@ -289,7 +289,9 @@ static int r300_get_param(struct pipe_screen* pscreen, enum pipe_cap param)
return 0;
}
static int r300_get_shader_param(struct pipe_screen *pscreen, unsigned shader, enum pipe_shader_cap param)
static int r300_get_shader_param(struct pipe_screen *pscreen,
enum pipe_shader_type shader,
enum pipe_shader_cap param)
{
struct r300_screen* r300screen = r300_screen(pscreen);
boolean is_r400 = r300screen->caps.is_r400;
@ -417,6 +419,8 @@ static int r300_get_shader_param(struct pipe_screen *pscreen, unsigned shader, e
return 0;
}
break;
default:
; /* nothing */
}
return 0;
}

View file

@ -484,7 +484,9 @@ static int r600_get_param(struct pipe_screen* pscreen, enum pipe_cap param)
return 0;
}
static int r600_get_shader_param(struct pipe_screen* pscreen, unsigned shader, enum pipe_shader_cap param)
static int r600_get_shader_param(struct pipe_screen* pscreen,
enum pipe_shader_type shader,
enum pipe_shader_cap param)
{
struct r600_screen *rscreen = (struct r600_screen *)pscreen;

View file

@ -564,7 +564,9 @@ static int si_get_param(struct pipe_screen* pscreen, enum pipe_cap param)
return 0;
}
static int si_get_shader_param(struct pipe_screen* pscreen, unsigned shader, enum pipe_shader_cap param)
static int si_get_shader_param(struct pipe_screen* pscreen,
enum pipe_shader_type shader,
enum pipe_shader_cap param)
{
struct si_screen *sscreen = (struct si_screen *)pscreen;

View file

@ -98,7 +98,8 @@ rbug_screen_get_param(struct pipe_screen *_screen,
static int
rbug_screen_get_shader_param(struct pipe_screen *_screen,
unsigned shader, enum pipe_shader_cap param)
enum pipe_shader_type shader,
enum pipe_shader_cap param)
{
struct rbug_screen *rb_screen = rbug_screen(_screen);
struct pipe_screen *screen = rb_screen->screen;

View file

@ -306,7 +306,9 @@ softpipe_get_param(struct pipe_screen *screen, enum pipe_cap param)
}
static int
softpipe_get_shader_param(struct pipe_screen *screen, unsigned shader, enum pipe_shader_cap param)
softpipe_get_shader_param(struct pipe_screen *screen,
enum pipe_shader_type shader,
enum pipe_shader_cap param)
{
struct softpipe_screen *sp_screen = softpipe_screen(screen);
switch(shader)

View file

@ -435,7 +435,8 @@ svga_get_param(struct pipe_screen *screen, enum pipe_cap param)
static int
vgpu9_get_shader_param(struct pipe_screen *screen, unsigned shader,
vgpu9_get_shader_param(struct pipe_screen *screen,
enum pipe_shader_type shader,
enum pipe_shader_cap param)
{
struct svga_screen *svgascreen = svga_screen(screen);
@ -590,7 +591,8 @@ vgpu9_get_shader_param(struct pipe_screen *screen, unsigned shader,
static int
vgpu10_get_shader_param(struct pipe_screen *screen, unsigned shader,
vgpu10_get_shader_param(struct pipe_screen *screen,
enum pipe_shader_type shader,
enum pipe_shader_cap param)
{
struct svga_screen *svgascreen = svga_screen(screen);
@ -675,7 +677,7 @@ vgpu10_get_shader_param(struct pipe_screen *screen, unsigned shader,
static int
svga_get_shader_param(struct pipe_screen *screen, unsigned shader,
svga_get_shader_param(struct pipe_screen *screen, enum pipe_shader_type shader,
enum pipe_shader_cap param)
{
struct svga_screen *svgascreen = svga_screen(screen);

View file

@ -344,7 +344,7 @@ swr_get_param(struct pipe_screen *screen, enum pipe_cap param)
static int
swr_get_shader_param(struct pipe_screen *screen,
unsigned shader,
enum pipe_shader_type shader,
enum pipe_shader_cap param)
{
if (shader == PIPE_SHADER_VERTEX ||

View file

@ -147,8 +147,9 @@ trace_screen_get_param(struct pipe_screen *_screen,
static int
trace_screen_get_shader_param(struct pipe_screen *_screen, unsigned shader,
enum pipe_shader_cap param)
trace_screen_get_shader_param(struct pipe_screen *_screen,
enum pipe_shader_type shader,
enum pipe_shader_cap param)
{
struct trace_screen *tr_scr = trace_screen(_screen);
struct pipe_screen *screen = tr_scr->screen;

View file

@ -344,8 +344,9 @@ vc4_screen_get_paramf(struct pipe_screen *pscreen, enum pipe_capf param)
}
static int
vc4_screen_get_shader_param(struct pipe_screen *pscreen, unsigned shader,
enum pipe_shader_cap param)
vc4_screen_get_shader_param(struct pipe_screen *pscreen,
enum pipe_shader_type shader,
enum pipe_shader_cap param)
{
if (shader != PIPE_SHADER_VERTEX &&
shader != PIPE_SHADER_FRAGMENT) {

View file

@ -274,7 +274,9 @@ virgl_get_param(struct pipe_screen *screen, enum pipe_cap param)
}
static int
virgl_get_shader_param(struct pipe_screen *screen, unsigned shader, enum pipe_shader_cap param)
virgl_get_shader_param(struct pipe_screen *screen,
enum pipe_shader_type shader,
enum pipe_shader_cap param)
{
struct virgl_screen *vscreen = virgl_screen(screen);
switch(shader)

View file

@ -97,7 +97,8 @@ struct pipe_screen {
* Query a per-shader-stage integer-valued capability/parameter/limit
* \param param one of PIPE_CAP_x
*/
int (*get_shader_param)( struct pipe_screen *, unsigned shader, enum pipe_shader_cap param );
int (*get_shader_param)( struct pipe_screen *, enum pipe_shader_type shader,
enum pipe_shader_cap param );
/**
* Query an integer-valued capability/parameter/limit for a codec/profile