fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-06 18:08:40 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

i830 driver first triangles (with a faked out bufmgr)

Browse source
This commit is contained in:
Keith Whitwell 2006-03-01 16:06:47 +00:00
parent cd32164cc6
commit 33e55c6a7d
5 changed files with 18 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/mesa/drivers/dri/i915/i830_metaops.c
View file

@ -317,24 +317,18 @@ static void set_vertex_format( struct intel_context *intel )
static void meta_import_pixel_state( struct intel_context *intel )
{
#if 0
struct i830_context *i830 = i830_context(&intel->ctx);
memcpy(i830->meta.Fog, i830->state.Fog, I830_FOG_SETUP_SIZE * 4);
i830->meta.Ctx[I830_CTXREG_LIS5] = i830->state.Ctx[I830_CTXREG_LIS5];
i830->meta.Ctx[I830_CTXREG_LIS6] = i830->state.Ctx[I830_CTXREG_LIS6];
i830->meta.Ctx[I830_CTXREG_STATE4] = i830->state.Ctx[I830_CTXREG_STATE4];
i830->meta.Ctx[I830_CTXREG_BLENDCOLOR1] = i830->state.Ctx[I830_CTXREG_BLENDCOLOR1];
i830->meta.Ctx[I830_CTXREG_IAB] = i830->state.Ctx[I830_CTXREG_IAB];
memcpy(i830->meta.Ctx, i830->state.Ctx, I830_CTX_SETUP_SIZE * 4);
i830->meta.Ctx[I830_CTXREG_STATE3] &= ~CULLMODE_MASK;
i830->meta.Stipple[I830_STPREG_ST1] &= ~ST1_ENABLE;
i830->meta.emitted &= ~I830_UPLOAD_CTX;
i830->meta.Buffer[I830_DESTREG_SENABLE] = i830->state.Buffer[I830_DESTREG_SENABLE];
i830->meta.Buffer[I830_DESTREG_SR1] = i830->state.Buffer[I830_DESTREG_SR1];
i830->meta.Buffer[I830_DESTREG_SR2] = i830->state.Buffer[I830_DESTREG_SR2];
i830->meta.emitted &= ~I830_UPLOAD_FOG;
i830->meta.emitted &= ~I830_UPLOAD_BUFFERS;
i830->meta.emitted &= ~I830_UPLOAD_CTX;
#endif
}

3
src/mesa/drivers/dri/i915/i830_state.c
View file

@ -1079,7 +1079,8 @@ void i830InitState( struct i830_context *i830 )
i830->current = &i830->state;
i830->state.emitted = 0;
i830->state.active = (I830_UPLOAD_TEXBLEND(0) |
i830->state.active = (I830_UPLOAD_INVARIENT |
I830_UPLOAD_TEXBLEND(0) |
I830_UPLOAD_STIPPLE |
I830_UPLOAD_CTX |
I830_UPLOAD_BUFFERS);

12
src/mesa/drivers/dri/i915/i830_vtbl.c
View file

@ -377,7 +377,13 @@ static void i830_emit_state( struct intel_context *intel )
if (dirty & I830_UPLOAD_CTX) {
if (INTEL_DEBUG & DEBUG_STATE)
fprintf(stderr, "I830_UPLOAD_CTX:\n");
emit( i830, state->Ctx, sizeof(state->Ctx) );
}
if (dirty & I830_UPLOAD_BUFFERS) {
if (INTEL_DEBUG & DEBUG_STATE)
fprintf(stderr, "I830_UPLOAD_BUFFERS:\n");
BEGIN_BATCH(I830_DEST_SETUP_SIZE+2, 0);
OUT_BATCH(state->Buffer[I830_DESTREG_CBUFADDR0]);
OUT_BATCH(state->Buffer[I830_DESTREG_CBUFADDR1]);
@ -396,12 +402,6 @@ static void i830_emit_state( struct intel_context *intel )
ADVANCE_BATCH();
}
if (dirty & I830_UPLOAD_BUFFERS) {
if (INTEL_DEBUG & DEBUG_STATE)
fprintf(stderr, "I830_UPLOAD_BUFFERS:\n");
emit( i830, state->Buffer, sizeof(state->Buffer) );
}
if (dirty & I830_UPLOAD_STIPPLE) {
if (INTEL_DEBUG & DEBUG_STATE)
fprintf(stderr, "I830_UPLOAD_STIPPLE:\n");

9
src/mesa/drivers/dri/i915/intel_mipmap_tree.c
View file

@ -79,14 +79,13 @@ struct intel_mipmap_tree *intel_miptree_create( struct intel_context *intel,
switch (intel->intelScreen->deviceID) {
case PCI_CHIP_I945_G:
/* case PCI_CHIP_I945_GM: */
ok = i945_miptree_layout( mt );
break;
case PCI_CHIP_I915_G:
case PCI_CHIP_I915_GM:
ok = i915_miptree_layout( mt );
break;
default:
ok = 0;
/* All the i830 chips and the i915 use this layout:
*/
ok = i915_miptree_layout( mt );
break;
}

2
src/mesa/drivers/dri/i915/intel_screen.c
View file

@ -333,7 +333,6 @@ static GLboolean intelCreateContext( const __GLcontextModes *mesaVis,
intelScreenPrivate *intelScreen = (intelScreenPrivate *)sPriv->private;
switch (intelScreen->deviceID) {
#if 0
/* Don't deal with i830 until texture work complete:
*/
case PCI_CHIP_845_G:
@ -342,7 +341,6 @@ static GLboolean intelCreateContext( const __GLcontextModes *mesaVis,
case PCI_CHIP_I865_G:
return i830CreateContext( mesaVis, driContextPriv,
sharedContextPrivate );
#endif
case PCI_CHIP_I915_G:
case PCI_CHIP_I915_GM: