fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-09 04:38:03 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

mesa: put _mesa_ prefix on vert_result_to_frag_attrib()

Browse source
This commit is contained in:
Brian Paul 2011-09-06 15:29:24 -06:00
parent a794ad3709
commit 51e7b05875
5 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/mesa/drivers/dri/i965/brw_fs.cpp
View file

@ -672,7 +672,7 @@ fs_visitor::calculate_urb_setup()
/* FINISHME: The sf doesn't map VS->FS inputs for us very well. */
for (unsigned int i = 0; i < VERT_RESULT_MAX; i++) {
if (c->key.vp_outputs_written & BITFIELD64_BIT(i)) {
int fp_index = vert_result_to_frag_attrib(i);
int fp_index = _mesa_vert_result_to_frag_attrib(i);
if (fp_index >= 0)
urb_setup[fp_index] = urb_next++;
@ -1826,7 +1826,7 @@ brw_fs_precompile(struct gl_context *ctx, struct gl_shader_program *prog)
key.proj_attrib_mask |= 1 << i;
int vp_index = vert_result_to_frag_attrib(i);
int vp_index = _mesa_vert_result_to_frag_attrib(i);
if (vp_index >= 0)
key.vp_outputs_written |= BITFIELD64_BIT(vp_index);

2
src/mesa/drivers/dri/i965/brw_vs_constval.c
View file

@ -146,7 +146,7 @@ static void calc_sizes( struct tracker *t )
for (vertRes = VERT_RESULT_TEX0; vertRes < VERT_RESULT_MAX; vertRes++) {
/* map vertex program output index to fragment program input index */
GLint fragAttrib = vert_result_to_frag_attrib(vertRes);
GLint fragAttrib = _mesa_vert_result_to_frag_attrib(vertRes);
if (fragAttrib < 0)
continue;
assert(fragAttrib >= FRAG_ATTRIB_TEX0);

2
src/mesa/drivers/dri/i965/brw_wm_pass2.c
View file

@ -94,7 +94,7 @@ static void init_registers( struct brw_wm_compile *c )
} else {
for (j = 0; j < VERT_RESULT_MAX; j++) {
if (c->key.vp_outputs_written & BITFIELD64_BIT(j)) {
int fp_index = vert_result_to_frag_attrib(j);
int fp_index = _mesa_vert_result_to_frag_attrib(j);
nr_interp_regs++;
if (fp_index >= 0)

2
src/mesa/drivers/dri/i965/gen6_sf_state.c
View file

@ -56,7 +56,7 @@ get_attr_override(struct brw_vue_map *vue_map, int urb_entry_read_offset,
int fs_attr, bool two_side_color)
{
int attr_override, slot;
int vs_attr = frag_attrib_to_vert_result(fs_attr);
int vs_attr = _mesa_frag_attrib_to_vert_result(fs_attr);
if (vs_attr < 0 || vs_attr == VERT_RESULT_HPOS) {
/* These attributes will be overwritten by the fragment shader's
* interpolation code (see emit_interp() in brw_wm_fp.c), so just let

8
src/mesa/main/mtypes.h
View file

@ -216,7 +216,7 @@ typedef enum
/**
* Indexes for vertex program result attributes. Note that
* vert_result_to_frag_attrib() and frag_attrib_to_vert_result() make
* _mesa_vert_result_to_frag_attrib() and _mesa_frag_attrib_to_vert_result() make
* assumptions about the layout of this enum.
*/
typedef enum
@ -316,7 +316,7 @@ typedef enum
/**
* Indexes for fragment program input attributes. Note that
* vert_result_to_frag_attrib() and frag_attrib_to_vert_result() make
* _mesa_vert_result_to_frag_attrib() and frag_attrib_to_vert_result() make
* assumptions about the layout of this enum.
*/
typedef enum
@ -348,7 +348,7 @@ typedef enum
* (VERT_RESULT_PSIZ, VERT_RESULT_BFC0, VERT_RESULT_BFC1, and
* VERT_RESULT_EDGE) are converted to a value of -1.
*/
static INLINE int vert_result_to_frag_attrib(gl_vert_result vert_result)
static INLINE int _mesa_vert_result_to_frag_attrib(gl_vert_result vert_result)
{
if (vert_result >= VERT_RESULT_VAR0)
return vert_result - VERT_RESULT_VAR0 + FRAG_ATTRIB_VAR0;
@ -366,7 +366,7 @@ static INLINE int vert_result_to_frag_attrib(gl_vert_result vert_result)
* gl_frag_attrib values which have no corresponding gl_vert_result
* (FRAG_ATTRIB_FACE and FRAG_ATTRIB_PNTC) are converted to a value of -1.
*/
static INLINE int frag_attrib_to_vert_result(gl_frag_attrib frag_attrib)
static INLINE int _mesa_frag_attrib_to_vert_result(gl_frag_attrib frag_attrib)
{
if (frag_attrib <= FRAG_ATTRIB_TEX7)
return frag_attrib;