AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove r200 dependency

Browse Source 
Remove r200 dependency from the code as r200 merged
driver never worked (right ?) and we want to clean
the code.
This commit is contained in:
Jerome Glisse
2006-09-26 17:35:41 +00:00
parent c67d8678dd
commit 9e82552c30
3 changed files with 2 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/mesa/drivers/dri/r300/radeon_ioctl.c
+2 -24
View File
@@ -40,16 +40,9 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include "macros.h"
#include "context.h"
#include "swrast/swrast.h"
#include "r200_context.h"
#include "r300_context.h"
#include "r200_state.h"
#include "radeon_ioctl.h"
#include "r200_ioctl.h"
#include "r300_ioctl.h"
#if R200_MERGED
#include "r200_tcl.h"
#include "r200_sanity.h"
#endif
#include "r300_state.h"
#include "radeon_reg.h"
@@ -245,10 +238,7 @@ void radeonCopyBuffer(const __DRIdrawablePrivate * dPriv,
UNLOCK_HARDWARE(radeon);
if (!rect)
{
if (IS_R200_CLASS(radeon->radeonScreen))
((r200ContextPtr)radeon)->hw.all_dirty = GL_TRUE;
else
((r300ContextPtr)radeon)->hw.all_dirty = GL_TRUE;
((r300ContextPtr)radeon)->hw.all_dirty = GL_TRUE;
radeon->swap_count++;
(*dri_interface->getUST) (&ust);
@@ -334,14 +324,6 @@ void radeonPageFlip(const __DRIdrawablePrivate * dPriv)
radeon->state.color.drawPitch = radeon->radeonScreen->backPitch;
}
if (IS_R200_CLASS(radeon->radeonScreen)) {
r200ContextPtr r200 = (r200ContextPtr)radeon;
R200_STATECHANGE(r200, ctx);
r200->hw.ctx.cmd[CTX_RB3D_COLOROFFSET] = radeon->state.color.drawOffset
+ radeon->radeonScreen->fbLocation;
r200->hw.ctx.cmd[CTX_RB3D_COLORPITCH] = radeon->state.color.drawPitch;
}
if (IS_R300_CLASS(radeon->radeonScreen)) {
r300ContextPtr r300 = (r300ContextPtr)radeon;
R300_STATECHANGE(r300, cb);
@@ -372,7 +354,7 @@ void radeonWaitForIdleLocked(radeonContextPtr radeon)
if (ret < 0) {
UNLOCK_HARDWARE(radeon);
fprintf(stderr, "Error: R200 timed out... exiting\n");
fprintf(stderr, "Error: R300 timed out... exiting\n");
exit(-1);
}
}
@@ -390,10 +372,6 @@ void radeonFlush(GLcontext * ctx)
if (IS_R300_CLASS(radeon->radeonScreen))
r300Flush(ctx);
#if R200_MERGED
else
r200Flush(ctx);
#endif
}
src/mesa/drivers/dri/r300/radeon_lock.c
-38
View File
@@ -33,12 +33,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
#include <string.h>
#include "r200_context.h"
#include "radeon_lock.h"
#if R200_MERGED
#include "r200_tex.h"
#endif
#include "r200_state.h"
#include "radeon_ioctl.h"
#include "radeon_state.h"
#include "r300_context.h"
@@ -79,35 +74,6 @@ static void radeonUpdatePageFlipping(radeonContextPtr radeon)
/**
* Called by radeonGetLock() after the lock has been obtained.
*/
#if R200_MERGED
static void r200RegainedLock(r200ContextPtr r200)
{
__DRIdrawablePrivate *dPriv = r200->radeon.dri.drawable;
int i;
if (r200->radeon.lastStamp != dPriv->lastStamp) {
radeonUpdatePageFlipping(&r200->radeon);
R200_STATECHANGE(r200, ctx);
r200->hw.ctx.cmd[CTX_RB3D_COLOROFFSET] =
r200->radeon.state.color.drawOffset
+ r200->radeon.radeonScreen->fbLocation;
r200->hw.ctx.cmd[CTX_RB3D_COLORPITCH] =
r200->radeon.state.color.drawPitch;
if (r200->radeon.glCtx->DrawBuffer->_ColorDrawBufferMask[0] == BUFFER_BIT_BACK_LEFT)
radeonSetCliprects(&r200->radeon, GL_BACK_LEFT);
else
radeonSetCliprects(&r200->radeon, GL_FRONT_LEFT);
r200UpdateViewportOffset(r200->radeon.glCtx);
r200->radeon.lastStamp = dPriv->lastStamp;
}
for (i = 0; i < r200->nr_heaps; i++) {
DRI_AGE_TEXTURES(r200->texture_heaps[i]);
}
}
#endif
static void r300RegainedLock(radeonContextPtr radeon)
{
__DRIdrawablePrivate *dPriv = radeon->dri.drawable;
@@ -173,10 +139,6 @@ void radeonGetLock(radeonContextPtr radeon, GLuint flags)
if (IS_R300_CLASS(radeon->radeonScreen))
r300RegainedLock(radeon);
#if R200_MERGED
else
r200RegainedLock((r200ContextPtr)radeon);
#endif
radeon->lost_context = GL_TRUE;
}
src/mesa/drivers/dri/r300/radeon_state.c
-2
View File
@@ -46,10 +46,8 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include "tnl/t_pipeline.h"
#include "swrast_setup/swrast_setup.h"
#include "r200_context.h"
#include "radeon_ioctl.h"
#include "radeon_state.h"
#include "r200_state.h"
#include "r300_ioctl.h"