summaryrefslogtreecommitdiff
path: root/src/mesa/drivers/dri/r200
diff options
context:
space:
mode:
authorDave Airlie <airlied@redhat.com>2009-01-14 15:12:57 +1000
committerDave Airlie <airlied@redhat.com>2009-01-14 15:14:09 +1000
commit61da612a4f8862e0aac4ff4fc87c133cb8a1c4a5 (patch)
tree33b7a7d7f840048c3f8fab8f8e693dce5ea59dab /src/mesa/drivers/dri/r200
parent23295cf8e84495af86f62395d32b3116261927e8 (diff)
r300: start moving new r300 cmdbuf into common code
Diffstat (limited to 'src/mesa/drivers/dri/r200')
-rw-r--r--src/mesa/drivers/dri/r200/Makefile2
-rw-r--r--src/mesa/drivers/dri/r200/r200_state.c4
2 files changed, 4 insertions, 2 deletions
diff --git a/src/mesa/drivers/dri/r200/Makefile b/src/mesa/drivers/dri/r200/Makefile
index 34aa74735b..5ba1603d79 100644
--- a/src/mesa/drivers/dri/r200/Makefile
+++ b/src/mesa/drivers/dri/r200/Makefile
@@ -51,6 +51,7 @@ COMMON_SYMLINKS = \
radeon_screen.c \
radeon_screen.h \
radeon_bo_legacy.h \
+ radeon_cs_legacy.h \
radeon_buffer.h \
common_context.h \
common_lock.c \
@@ -58,6 +59,7 @@ COMMON_SYMLINKS = \
common_misc.h \
common_misc.c
+
##### TARGETS #####
diff --git a/src/mesa/drivers/dri/r200/r200_state.c b/src/mesa/drivers/dri/r200/r200_state.c
index 67357fadfd..997c1711f9 100644
--- a/src/mesa/drivers/dri/r200/r200_state.c
+++ b/src/mesa/drivers/dri/r200/r200_state.c
@@ -1711,7 +1711,7 @@ void r200UpdateViewportOffset( GLcontext *ctx )
}
}
- r200UpdateScissor( ctx );
+ radeonUpdateScissor( ctx );
}
@@ -2056,7 +2056,7 @@ static void r200Enable( GLcontext *ctx, GLenum cap, GLboolean state )
case GL_SCISSOR_TEST:
R200_FIREVERTICES( rmesa );
rmesa->radeon.state.scissor.enabled = state;
- r200UpdateScissor( ctx );
+ radeonUpdateScissor( ctx );
break;
case GL_STENCIL_TEST: