summaryrefslogtreecommitdiffstats
path: root/src/gallium/drivers/r300
diff options
context:
space:
mode:
authorCorbin Simpson <[email protected]>2009-02-12 20:47:15 -0800
committerCorbin Simpson <[email protected]>2009-02-12 20:47:15 -0800
commitfe7863f3f82cda290334cecfde816e21a0e9f5d3 (patch)
tree7bda946b35abe76f3b1045169f1d042c918cc821 /src/gallium/drivers/r300
parent1d2c31df41d2a52b306fd65bbb6c800e993a2798 (diff)
r300-gallium: Fix linker error a few linker warnings.
A few prototypes, a missing header, a misspelled macro.
Diffstat (limited to 'src/gallium/drivers/r300')
-rw-r--r--src/gallium/drivers/r300/r300_emit.c2
-rw-r--r--src/gallium/drivers/r300/r300_emit.h11
2 files changed, 12 insertions, 1 deletions
diff --git a/src/gallium/drivers/r300/r300_emit.c b/src/gallium/drivers/r300/r300_emit.c
index a3b2772e155..c0990cabd9c 100644
--- a/src/gallium/drivers/r300/r300_emit.c
+++ b/src/gallium/drivers/r300/r300_emit.c
@@ -86,7 +86,7 @@ void r300_emit_fragment_shader(struct r300_context* r300,
int i;
BEGIN_CS(0);
- OUT_CS_REG(R300_US_CONFIG, MAX(fs->indirections - 1, 0));
+ OUT_CS_REG(R300_US_CONFIG, MAX2(fs->indirections - 1, 0));
OUT_CS_REG(R300_US_PIXSIZE, fs->shader.stack_size);
/* XXX figure out exactly how big the sizes are on this reg */
OUT_CS_REG(R300_US_CODE_OFFSET, 0x0);
diff --git a/src/gallium/drivers/r300/r300_emit.h b/src/gallium/drivers/r300/r300_emit.h
index b6e69386f95..4c5a6d292e8 100644
--- a/src/gallium/drivers/r300/r300_emit.h
+++ b/src/gallium/drivers/r300/r300_emit.h
@@ -20,6 +20,8 @@
* OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
* USE OR OTHER DEALINGS IN THE SOFTWARE. */
+#include "util/u_math.h"
+
#include "r300_context.h"
#include "r300_cs.h"
#include "r300_screen.h"
@@ -33,4 +35,13 @@ void r300_emit_blend_color_state(struct r300_context* r300,
void r300_emit_dsa_state(struct r300_context* r300,
struct r300_dsa_state* dsa);
+void r300_emit_fragment_shader(struct r300_context* r300,
+ struct r300_fragment_shader* fs);
+
+void r500_emit_fragment_shader(struct r300_context* r300,
+ struct r500_fragment_shader* fs);
+
+void r300_emit_fb_state(struct r300_context* r300,
+ struct pipe_framebuffer_state* fb);
+
void r300_emit_rs_state(struct r300_context* r300, struct r300_rs_state* rs);