summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOliver McFadden <z3ro.geek@gmail.com>2007-05-09 15:28:38 +0000
committerOliver McFadden <z3ro.geek@gmail.com>2007-05-09 15:28:38 +0000
commitc48e4c6f09e4951a871163537a1e2117116e620b (patch)
tree91a2c3f28f2678ba99f89bb2128e933c29fcf27c
parent4f20fe8a930007ca8fd5ddaf3969902fa60a7714 (diff)
r300: Fixed indenting from previous commit
d28f6d91760374e2eb71b541b0f259f81dd73c69.
-rw-r--r--src/mesa/drivers/dri/r300/r300_fragprog.c2
-rw-r--r--src/mesa/drivers/dri/r300/r300_fragprog.h2
-rw-r--r--src/mesa/drivers/dri/r300/r300_state.c7
-rw-r--r--src/mesa/drivers/dri/r300/r300_state.h2
-rw-r--r--src/mesa/drivers/dri/r300/r300_vertprog.c2
5 files changed, 7 insertions, 8 deletions
diff --git a/src/mesa/drivers/dri/r300/r300_fragprog.c b/src/mesa/drivers/dri/r300/r300_fragprog.c
index 7a82dc4ba1..53866414f9 100644
--- a/src/mesa/drivers/dri/r300/r300_fragprog.c
+++ b/src/mesa/drivers/dri/r300/r300_fragprog.c
@@ -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;
diff --git a/src/mesa/drivers/dri/r300/r300_fragprog.h b/src/mesa/drivers/dri/r300/r300_fragprog.h
index 218a3c965d..b92312aef0 100644
--- a/src/mesa/drivers/dri/r300/r300_fragprog.h
+++ b/src/mesa/drivers/dri/r300/r300_fragprog.h
@@ -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
diff --git a/src/mesa/drivers/dri/r300/r300_state.c b/src/mesa/drivers/dri/r300/r300_state.c
index 5a7ba8d0f0..af4326ed7e 100644
--- a/src/mesa/drivers/dri/r300/r300_state.c
+++ b/src/mesa/drivers/dri/r300/r300_state.c
@@ -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,
diff --git a/src/mesa/drivers/dri/r300/r300_state.h b/src/mesa/drivers/dri/r300/r300_state.h
index 00323cd834..3b9d8e7404 100644
--- a/src/mesa/drivers/dri/r300/r300_state.h
+++ b/src/mesa/drivers/dri/r300/r300_state.h
@@ -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__ */
diff --git a/src/mesa/drivers/dri/r300/r300_vertprog.c b/src/mesa/drivers/dri/r300/r300_vertprog.c
index b0a7a66137..8b1143758e 100644
--- a/src/mesa/drivers/dri/r300/r300_vertprog.c
+++ b/src/mesa/drivers/dri/r300/r300_vertprog.c
@@ -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;