fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-22 20:00:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

i915: Remove i965 paths from i915_update_drawbuffer() and i830's too.

Browse source 
Reviewed-by: Chad Versace <chad@chad-versace.us>
This commit is contained in:
Eric Anholt 2011-07-12 10:03:41 -07:00
parent 94efc350b4
commit 4c47fce92e
2 changed files with 20 additions and 111 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -722,27 +722,8 @@ i830_update_draw_buffer(struct intel_context *intel)
return; return;
} }
/*
* If intel_context is using separate stencil, but the depth attachment
* (gl_framebuffer.Attachment[BUFFER_DEPTH]) has a packed depth/stencil
* format, then we must install the real depth buffer at fb->_DepthBuffer
* and set fb->_DepthBuffer->Wrapped before calling _mesa_update_framebuffer.
* Otherwise, _mesa_update_framebuffer will create and install a swras
* depth wrapper instead.
*
* Ditto for stencil.
*/
irbDepth = intel_get_renderbuffer(fb, BUFFER_DEPTH); irbDepth = intel_get_renderbuffer(fb, BUFFER_DEPTH);
if (irbDepth && irbDepth->Base.Format == MESA_FORMAT_X8_Z24) {
_mesa_reference_renderbuffer(&fb->_DepthBuffer, &irbDepth->Base);
irbDepth->Base.Wrapped = fb->Attachment[BUFFER_DEPTH].Renderbuffer;
}
irbStencil = intel_get_renderbuffer(fb, BUFFER_STENCIL); irbStencil = intel_get_renderbuffer(fb, BUFFER_STENCIL);
if (irbStencil && irbStencil->Base.Format == MESA_FORMAT_S8) {
_mesa_reference_renderbuffer(&fb->_StencilBuffer, &irbStencil->Base);
irbStencil->Base.Wrapped = fb->Attachment[BUFFER_STENCIL].Renderbuffer;
}
/* Do this here, not core Mesa, since this function is called from /* Do this here, not core Mesa, since this function is called from
* many places within the driver. * many places within the driver.
@ -825,12 +806,7 @@ i830_update_draw_buffer(struct intel_context *intel)
/* Check for stencil fallback. */ /* Check for stencil fallback. */
if (irbStencil && irbStencil->region) { if (irbStencil && irbStencil->region) {
if (!intel->has_separate_stencil) assert(irbStencil->Base.Format == MESA_FORMAT_S8_Z24);
assert(irbStencil->Base.Format == MESA_FORMAT_S8_Z24);
if (fb_has_hiz || intel->must_use_separate_stencil)
assert(irbStencil->Base.Format == MESA_FORMAT_S8);
if (irbStencil->Base.Format == MESA_FORMAT_S8)
assert(intel->has_separate_stencil);
FALLBACK(intel, INTEL_FALLBACK_STENCIL_BUFFER, GL_FALSE); FALLBACK(intel, INTEL_FALLBACK_STENCIL_BUFFER, GL_FALSE);
} else if (irbStencil && !irbStencil->region) { } else if (irbStencil && !irbStencil->region) {
FALLBACK(intel, INTEL_FALLBACK_STENCIL_BUFFER, GL_TRUE); FALLBACK(intel, INTEL_FALLBACK_STENCIL_BUFFER, GL_TRUE);
@ -850,50 +826,29 @@ i830_update_draw_buffer(struct intel_context *intel)
/* /*
* Update depth and stencil test state * Update depth and stencil test state
*/ */
if (ctx->Driver.Enable) { ctx->Driver.Enable(ctx, GL_DEPTH_TEST,
ctx->Driver.Enable(ctx, GL_DEPTH_TEST, (ctx->Depth.Test && fb->Visual.depthBits > 0));
(ctx->Depth.Test && fb->Visual.depthBits > 0)); ctx->Driver.Enable(ctx, GL_STENCIL_TEST,
ctx->Driver.Enable(ctx, GL_STENCIL_TEST, (ctx->Stencil.Enabled && fb->Visual.stencilBits > 0));
(ctx->Stencil.Enabled && fb->Visual.stencilBits > 0));
}
else {
/* Mesa's Stencil._Enabled field is updated when
* _NEW_BUFFERS | _NEW_STENCIL, but i965 code assumes that the value
* only changes with _NEW_STENCIL (which seems sensible). So flag it
* here since this is the _NEW_BUFFERS path.
*/
intel->NewGLState |= (_NEW_DEPTH | _NEW_STENCIL);
}
intel->vtbl.set_draw_region(intel, colorRegions, depthRegion, intel->vtbl.set_draw_region(intel, colorRegions, depthRegion,
fb->_NumColorDrawBuffers); fb->_NumColorDrawBuffers);
intel->NewGLState |= _NEW_BUFFERS; intel->NewGLState |= _NEW_BUFFERS;
/* update viewport since it depends on window size */ /* update viewport since it depends on window size */
#ifdef I915
intelCalcViewport(ctx); intelCalcViewport(ctx);
#else
intel->NewGLState |= _NEW_VIEWPORT;
#endif
/* Set state we know depends on drawable parameters: /* Set state we know depends on drawable parameters:
*/ */
if (ctx->Driver.Scissor) ctx->Driver.Scissor(ctx, ctx->Scissor.X, ctx->Scissor.Y,
ctx->Driver.Scissor(ctx, ctx->Scissor.X, ctx->Scissor.Y, ctx->Scissor.Width, ctx->Scissor.Height);
ctx->Scissor.Width, ctx->Scissor.Height);
intel->NewGLState |= _NEW_SCISSOR;
if (ctx->Driver.DepthRange) ctx->Driver.DepthRange(ctx, ctx->Viewport.Near, ctx->Viewport.Far);
ctx->Driver.DepthRange(ctx,
ctx->Viewport.Near,
ctx->Viewport.Far);
/* Update culling direction which changes depending on the /* Update culling direction which changes depending on the
* orientation of the buffer: * orientation of the buffer:
*/ */
if (ctx->Driver.FrontFace) ctx->Driver.FrontFace(ctx, ctx->Polygon.FrontFace);
ctx->Driver.FrontFace(ctx, ctx->Polygon.FrontFace);
else
intel->NewGLState |= _NEW_POLYGON;
} }
/* This isn't really handled at the moment. /* This isn't really handled at the moment.

66
src/mesa/drivers/dri/i915/i915_vtbl.c
View file

@ -694,27 +694,8 @@ i915_update_draw_buffer(struct intel_context *intel)
return; return;
} }
/*
* If intel_context is using separate stencil, but the depth attachment
* (gl_framebuffer.Attachment[BUFFER_DEPTH]) has a packed depth/stencil
* format, then we must install the real depth buffer at fb->_DepthBuffer
* and set fb->_DepthBuffer->Wrapped before calling _mesa_update_framebuffer.
* Otherwise, _mesa_update_framebuffer will create and install a swras
* depth wrapper instead.
*
* Ditto for stencil.
*/
irbDepth = intel_get_renderbuffer(fb, BUFFER_DEPTH); irbDepth = intel_get_renderbuffer(fb, BUFFER_DEPTH);
if (irbDepth && irbDepth->Base.Format == MESA_FORMAT_X8_Z24) {
_mesa_reference_renderbuffer(&fb->_DepthBuffer, &irbDepth->Base);
irbDepth->Base.Wrapped = fb->Attachment[BUFFER_DEPTH].Renderbuffer;
}
irbStencil = intel_get_renderbuffer(fb, BUFFER_STENCIL); irbStencil = intel_get_renderbuffer(fb, BUFFER_STENCIL);
if (irbStencil && irbStencil->Base.Format == MESA_FORMAT_S8) {
_mesa_reference_renderbuffer(&fb->_StencilBuffer, &irbStencil->Base);
irbStencil->Base.Wrapped = fb->Attachment[BUFFER_STENCIL].Renderbuffer;
}
/* Do this here, not core Mesa, since this function is called from /* Do this here, not core Mesa, since this function is called from
* many places within the driver. * many places within the driver.
@ -797,12 +778,7 @@ i915_update_draw_buffer(struct intel_context *intel)
/* Check for stencil fallback. */ /* Check for stencil fallback. */
if (irbStencil && irbStencil->region) { if (irbStencil && irbStencil->region) {
if (!intel->has_separate_stencil) assert(irbStencil->Base.Format == MESA_FORMAT_S8_Z24);
assert(irbStencil->Base.Format == MESA_FORMAT_S8_Z24);
if (fb_has_hiz || intel->must_use_separate_stencil)
assert(irbStencil->Base.Format == MESA_FORMAT_S8);
if (irbStencil->Base.Format == MESA_FORMAT_S8)
assert(intel->has_separate_stencil);
FALLBACK(intel, INTEL_FALLBACK_STENCIL_BUFFER, GL_FALSE); FALLBACK(intel, INTEL_FALLBACK_STENCIL_BUFFER, GL_FALSE);
} else if (irbStencil && !irbStencil->region) { } else if (irbStencil && !irbStencil->region) {
FALLBACK(intel, INTEL_FALLBACK_STENCIL_BUFFER, GL_TRUE); FALLBACK(intel, INTEL_FALLBACK_STENCIL_BUFFER, GL_TRUE);
@ -822,50 +798,28 @@ i915_update_draw_buffer(struct intel_context *intel)
/* /*
* Update depth and stencil test state * Update depth and stencil test state
*/ */
if (ctx->Driver.Enable) { ctx->Driver.Enable(ctx, GL_DEPTH_TEST,
ctx->Driver.Enable(ctx, GL_DEPTH_TEST, (ctx->Depth.Test && fb->Visual.depthBits > 0));
(ctx->Depth.Test && fb->Visual.depthBits > 0)); ctx->Driver.Enable(ctx, GL_STENCIL_TEST,
ctx->Driver.Enable(ctx, GL_STENCIL_TEST, (ctx->Stencil.Enabled && fb->Visual.stencilBits > 0));
(ctx->Stencil.Enabled && fb->Visual.stencilBits > 0));
}
else {
/* Mesa's Stencil._Enabled field is updated when
* _NEW_BUFFERS | _NEW_STENCIL, but i965 code assumes that the value
* only changes with _NEW_STENCIL (which seems sensible). So flag it
* here since this is the _NEW_BUFFERS path.
*/
intel->NewGLState |= (_NEW_DEPTH | _NEW_STENCIL);
}
intel->vtbl.set_draw_region(intel, colorRegions, depthRegion, intel->vtbl.set_draw_region(intel, colorRegions, depthRegion,
fb->_NumColorDrawBuffers); fb->_NumColorDrawBuffers);
intel->NewGLState |= _NEW_BUFFERS; intel->NewGLState |= _NEW_BUFFERS;
/* update viewport since it depends on window size */ /* update viewport since it depends on window size */
#ifdef I915
intelCalcViewport(ctx); intelCalcViewport(ctx);
#else
intel->NewGLState |= _NEW_VIEWPORT;
#endif
/* Set state we know depends on drawable parameters: /* Set state we know depends on drawable parameters:
*/ */
if (ctx->Driver.Scissor) ctx->Driver.Scissor(ctx, ctx->Scissor.X, ctx->Scissor.Y,
ctx->Driver.Scissor(ctx, ctx->Scissor.X, ctx->Scissor.Y, ctx->Scissor.Width, ctx->Scissor.Height);
ctx->Scissor.Width, ctx->Scissor.Height); ctx->Driver.DepthRange(ctx, ctx->Viewport.Near, ctx->Viewport.Far);
intel->NewGLState |= _NEW_SCISSOR;
if (ctx->Driver.DepthRange)
ctx->Driver.DepthRange(ctx,
ctx->Viewport.Near,
ctx->Viewport.Far);
/* Update culling direction which changes depending on the /* Update culling direction which changes depending on the
* orientation of the buffer: * orientation of the buffer:
*/ */
if (ctx->Driver.FrontFace) ctx->Driver.FrontFace(ctx, ctx->Polygon.FrontFace);
ctx->Driver.FrontFace(ctx, ctx->Polygon.FrontFace);
else
intel->NewGLState |= _NEW_POLYGON;
} }
static void static void