OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gallium/util: replace unsigned with tgsi enum types

Browse Source 
Reviewed-by: Roland Scheidegger <sroland@vmware.com>
This commit is contained in:
Brian Paul
2018-02-06 21:54:38 -07:00
parent 5a38d8f103
commit 15874338ff
2 changed files with 34 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/gallium/auxiliary/util/u_simple_shaders.c
View File

@@ -202,7 +202,8 @@ void *util_make_layered_clear_geometry_shader(struct pipe_context *pipe)
static void static void
ureg_load_tex(struct ureg_program *ureg, struct ureg_dst out, ureg_load_tex(struct ureg_program *ureg, struct ureg_dst out,
struct ureg_src coord, struct ureg_src sampler, struct ureg_src coord, struct ureg_src sampler,
unsigned tex_target, bool load_level_zero, bool use_txf) enum tgsi_texture_type tex_target,
bool load_level_zero, bool use_txf)
{ {
if (use_txf) { if (use_txf) {
struct ureg_dst temp = ureg_DECL_temporary(ureg); struct ureg_dst temp = ureg_DECL_temporary(ureg);
@@ -277,14 +278,14 @@ util_make_fragment_tex_shader_xrbias(struct pipe_context *pipe,
* MOV OUT[0], TEMP[0] * MOV OUT[0], TEMP[0]
* END; * END;
* *
* \param tex_target one of PIPE_TEXTURE_x * \param tex_target one of TGSI_TEXTURE_x
* \parma interp_mode either TGSI_INTERPOLATE_LINEAR or PERSPECTIVE * \parma interp_mode either TGSI_INTERPOLATE_LINEAR or PERSPECTIVE
* \param writemask mask of TGSI_WRITEMASK_x * \param writemask mask of TGSI_WRITEMASK_x
*/ */
void * void *
util_make_fragment_tex_shader_writemask(struct pipe_context *pipe, util_make_fragment_tex_shader_writemask(struct pipe_context *pipe,
unsigned tex_target, enum tgsi_texture_type tex_target,
unsigned interp_mode, enum tgsi_interpolate_mode interp_mode,
unsigned writemask, unsigned writemask,
enum tgsi_return_type stype, enum tgsi_return_type stype,
enum tgsi_return_type dtype, enum tgsi_return_type dtype,
@@ -357,11 +358,12 @@ util_make_fragment_tex_shader_writemask(struct pipe_context *pipe,
/** /**
* Make a simple fragment shader that sets the output color to a color * Make a simple fragment shader that sets the output color to a color
* taken from a texture. * taken from a texture.
* \param tex_target one of PIPE_TEXTURE_x * \param tex_target one of TGSI_TEXTURE_x
*/ */
void * void *
util_make_fragment_tex_shader(struct pipe_context *pipe, unsigned tex_target, util_make_fragment_tex_shader(struct pipe_context *pipe,
unsigned interp_mode, enum tgsi_texture_type tex_target,
enum tgsi_interpolate_mode interp_mode,
enum tgsi_return_type stype, enum tgsi_return_type stype,
enum tgsi_return_type dtype, enum tgsi_return_type dtype,
bool load_level_zero, bool load_level_zero,
@@ -382,8 +384,8 @@ util_make_fragment_tex_shader(struct pipe_context *pipe, unsigned tex_target,
*/ */
void * void *
util_make_fragment_tex_shader_writedepth(struct pipe_context *pipe, util_make_fragment_tex_shader_writedepth(struct pipe_context *pipe,
unsigned tex_target, enum tgsi_texture_type tex_target,
unsigned interp_mode, enum tgsi_interpolate_mode interp_mode,
bool load_level_zero, bool load_level_zero,
bool use_txf) bool use_txf)
{ {
@@ -435,8 +437,8 @@ util_make_fragment_tex_shader_writedepth(struct pipe_context *pipe,
*/ */
void * void *
util_make_fragment_tex_shader_writedepthstencil(struct pipe_context *pipe, util_make_fragment_tex_shader_writedepthstencil(struct pipe_context *pipe,
unsigned tex_target, enum tgsi_texture_type tex_target,
unsigned interp_mode, enum tgsi_interpolate_mode interp_mode,
bool load_level_zero, bool load_level_zero,
bool use_txf) bool use_txf)
{ {
@@ -499,8 +501,8 @@ util_make_fragment_tex_shader_writedepthstencil(struct pipe_context *pipe,
*/ */
void * void *
util_make_fragment_tex_shader_writestencil(struct pipe_context *pipe, util_make_fragment_tex_shader_writestencil(struct pipe_context *pipe,
unsigned tex_target, enum tgsi_texture_type tex_target,
unsigned interp_mode, enum tgsi_interpolate_mode interp_mode,
bool load_level_zero, bool load_level_zero,
bool use_txf) bool use_txf)
{ {

21
src/gallium/auxiliary/util/u_simple_shaders.h
View File

@@ -74,8 +74,8 @@ util_make_fragment_tex_shader_xrbias(struct pipe_context *pipe,
extern void * extern void *
util_make_fragment_tex_shader_writemask(struct pipe_context *pipe, util_make_fragment_tex_shader_writemask(struct pipe_context *pipe,
unsigned tex_target, enum tgsi_texture_type tex_target,
unsigned interp_mode, enum tgsi_interpolate_mode interp_mode,
unsigned writemask, unsigned writemask,
enum tgsi_return_type stype, enum tgsi_return_type stype,
enum tgsi_return_type dtype, enum tgsi_return_type dtype,
@@ -83,8 +83,9 @@ util_make_fragment_tex_shader_writemask(struct pipe_context *pipe,
bool use_txf); bool use_txf);
extern void * extern void *
util_make_fragment_tex_shader(struct pipe_context *pipe, unsigned tex_target, util_make_fragment_tex_shader(struct pipe_context *pipe,
unsigned interp_mode, enum tgsi_texture_type tex_target,
enum tgsi_interpolate_mode interp_mode,
enum tgsi_return_type stype, enum tgsi_return_type stype,
enum tgsi_return_type dtype, enum tgsi_return_type dtype,
bool load_level_zero, bool load_level_zero,
@@ -92,24 +93,24 @@ util_make_fragment_tex_shader(struct pipe_context *pipe, unsigned tex_target,
extern void * extern void *
util_make_fragment_tex_shader_writedepth(struct pipe_context *pipe, util_make_fragment_tex_shader_writedepth(struct pipe_context *pipe,
unsigned tex_target, enum tgsi_texture_type tex_target,
unsigned interp_mode, enum tgsi_interpolate_mode interp_mode,
bool load_level_zero, bool load_level_zero,
bool use_txf); bool use_txf);
extern void * extern void *
util_make_fragment_tex_shader_writedepthstencil(struct pipe_context *pipe, util_make_fragment_tex_shader_writedepthstencil(struct pipe_context *pipe,
unsigned tex_target, enum tgsi_texture_type tex_target,
unsigned interp_mode, enum tgsi_interpolate_mode interp_mode,
bool load_level_zero, bool load_level_zero,
bool use_txf); bool use_txf);
extern void * extern void *
util_make_fragment_tex_shader_writestencil(struct pipe_context *pipe, util_make_fragment_tex_shader_writestencil(struct pipe_context *pipe,
unsigned tex_target, enum tgsi_texture_type tex_target,
unsigned interp_mode, enum tgsi_interpolate_mode interp_mode,
bool load_level_zero, bool load_level_zero,
bool use_txf); bool use_txf);