diff options
| author | Jerome Glisse <glisse@freedesktop.org> | 2006-09-26 17:28:40 +0000 |
|---|---|---|
| committer | Jerome Glisse <glisse@freedesktop.org> | 2006-09-26 17:28:40 +0000 |
| commit | c67d8678dd50f74906d3eb666fdd76144d1d293f (patch) | |
| tree | 522565888d5db5760059859726a3ea5a926058cc /src/mesa | |
| parent | ea87987ddaa4d963b00dfe51af3387615dd90594 (diff) | |
Remove r200 dependency.
Remove r200*.h files dependency.
Diffstat (limited to 'src/mesa')
| -rw-r--r-- | src/mesa/drivers/dri/r300/radeon_context.c | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/src/mesa/drivers/dri/r300/radeon_context.c b/src/mesa/drivers/dri/r300/radeon_context.c index e824a923ac..463b3cf85b 100644 --- a/src/mesa/drivers/dri/r300/radeon_context.c +++ b/src/mesa/drivers/dri/r300/radeon_context.c @@ -47,11 +47,9 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include "swrast/swrast.h" #include "radeon_screen.h" -#include "r200_context.h" #include "radeon_ioctl.h" #include "radeon_macros.h" #include "radeon_reg.h" -#include "r200_state.h" #include "r300_state.h" @@ -292,12 +290,6 @@ GLboolean radeonMakeCurrent(__DRIcontextPrivate * driContextPriv, r300UpdateWindow(radeon->glCtx); r300UpdateViewportOffset(radeon->glCtx); -#if R200_MERGED - if (IS_R200_CLASS(radeon->radeonScreen)) { - r200UpdateWindow(radeon->glCtx); - r200UpdateViewportOffset(radeon->glCtx); - } -#endif } _mesa_make_current(radeon->glCtx, @@ -311,13 +303,7 @@ GLboolean radeonMakeCurrent(__DRIcontextPrivate * driContextPriv, driDrawPriv->w, driDrawPriv->h); } - _mesa_update_state(radeon->glCtx); - -#if R200_MERGED - if (IS_R200_CLASS(radeon->radeonScreen)) - r200ValidateState(radeon->glCtx); -#endif - + _mesa_update_state(radeon->glCtx); } else { if (RADEON_DEBUG & DEBUG_DRI) fprintf(stderr, "%s ctx is null\n", __FUNCTION__); |