@@ -2210,7 +2210,7 @@ static void update_params(struct r300_fragment_program *rp)
|
||||
}
|
||||
|
||||
void r300TranslateFragmentShader(r300ContextPtr r300,
|
||||
struct r300_fragment_program *rp)
|
||||
struct r300_fragment_program *rp)
|
||||
{
|
||||
struct r300_pfs_compile_state *cs = NULL;
|
||||
|
||||
|
||||
@@ -99,6 +99,6 @@ typedef struct r300_fragment_program_swizzle {
|
||||
struct r300_fragment_program;
|
||||
|
||||
extern void r300TranslateFragmentShader(r300ContextPtr r300,
|
||||
struct r300_fragment_program *rp);
|
||||
struct r300_fragment_program *rp);
|
||||
|
||||
#endif
|
||||
|
||||
@@ -167,7 +167,7 @@ static int blend_factor(GLenum factor, GLboolean is_src)
|
||||
|
||||
/* helper function */
|
||||
static void r300SetBlendCntl(r300ContextPtr r300, int func, int eqn,
|
||||
int cbits, int funcA, int eqnA)
|
||||
int cbits, int funcA, int eqnA)
|
||||
{
|
||||
GLuint new_ablend, new_cblend;
|
||||
|
||||
@@ -292,9 +292,8 @@ static void r300SetBlendState(GLcontext * ctx)
|
||||
}
|
||||
|
||||
r300SetBlendCntl(r300,
|
||||
func, eqn,
|
||||
R300_BLEND_UNKNOWN | R300_BLEND_ENABLE, funcA,
|
||||
eqnA);
|
||||
func, eqn,
|
||||
R300_BLEND_UNKNOWN | R300_BLEND_ENABLE, funcA, eqnA);
|
||||
}
|
||||
|
||||
static void r300BlendEquationSeparate(GLcontext * ctx,
|
||||
|
||||
@@ -73,6 +73,6 @@ extern void r300UpdateShaders(r300ContextPtr rmesa);
|
||||
extern void r300UpdateShaderStates(r300ContextPtr rmesa);
|
||||
|
||||
extern void r300PrintStateAtom(r300ContextPtr r300,
|
||||
struct r300_state_atom *state);
|
||||
struct r300_state_atom *state);
|
||||
|
||||
#endif /* __R300_STATE_H__ */
|
||||
|
||||
@@ -411,7 +411,7 @@ static GLboolean valid_dst(struct r300_vertex_program *vp,
|
||||
} while (0)
|
||||
|
||||
static void r300TranslateVertexShader(struct r300_vertex_program *vp,
|
||||
struct prog_instruction *vpi)
|
||||
struct prog_instruction *vpi)
|
||||
{
|
||||
int i, cur_reg = 0;
|
||||
VERTEX_SHADER_INSTRUCTION *o_inst;
|
||||
|
||||
Reference in New Issue
Block a user