fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-26 07:50:20 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

r300: Removed the ugly CARD32 type.

Browse source
This commit is contained in:
Oliver McFadden 2007-05-09 02:27:08 +00:00
parent 4960af08ad
commit 33939fd29b
2 changed files with 7 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/mesa/drivers/dri/r300/r300_context.h
View file

@ -92,12 +92,8 @@ typedef struct r300_context *r300ContextPtr;
#define WARN_ONCE(a, ...) {}
#endif
/* We should probably change types within vertex_shader
and pixel_shader structure later on */
#define CARD32 GLuint
#include "r300_vertprog.h"
#include "r300_fragprog.h"
#undef CARD32
static __inline__ uint32_t r300PackFloat32(float fl)
{

14
src/mesa/drivers/dri/r300/r300_vertprog.h
View file

@ -2,11 +2,11 @@
#define __R300_VERTPROG_H_
typedef struct {
CARD32 op;
CARD32 src1;
CARD32 src2;
CARD32 src3;
} VERTEX_SHADER_INSTRUCTION;
GLuint op;
GLuint src1;
GLuint src2;
GLuint src3;
} VERTEX_SHADER_INSTRUCTION;
#define VSF_FLAG_X 1
#define VSF_FLAG_Y 2
@ -21,7 +21,7 @@ typedef struct {
#define VSF_OUT_CLASS_RESULT 2
/* first CARD32 of an instruction */
/* first DWORD of an instruction */
/* possible operations:
DOT, MUL, ADD, MAD, FRC, MAX, MIN, SGE, SLT, EXP, LOG, LIT, POW, RCP, RSQ, EX2,
@ -36,7 +36,7 @@ typedef struct {
#define EASY_VSF_OP(op, out_reg_index, out_reg_fields, class) \
MAKE_VSF_OP(R300_VPI_OUT_OP_##op, out_reg_index, VSF_FLAG_##out_reg_fields, VSF_OUT_CLASS_##class) \
/* according to Nikolai, the subsequent 3 CARD32 are sources, use same define for each */
/* according to Nikolai, the subsequent 3 DWORDs are sources, use same define for each */
#define VSF_IN_CLASS_TMP 0
#define VSF_IN_CLASS_ATTR 1