summaryrefslogtreecommitdiff
path: root/src/mesa/state_tracker/st_atom_framebuffer.c
diff options
context:
space:
mode:
authorBrian <brian@i915.localnet.net>2007-08-09 12:59:11 -0600
committerBrian <brian@i915.localnet.net>2007-08-09 14:29:48 -0600
commitf5713c7d2e7ba8e1170fd9b1dd95379662ab6117 (patch)
tree30cf85b542002d7bba214eb250ca34d96cbd06d1 /src/mesa/state_tracker/st_atom_framebuffer.c
parent36fc648ddd937962e659d6215ed6cfb864fb9f05 (diff)
Checkpoint intel_renderbuffer removal.
Remove surface ptr from gl_renderbuffer. Use st_renderbuffer in most places. More clean-up.
Diffstat (limited to 'src/mesa/state_tracker/st_atom_framebuffer.c')
-rw-r--r--src/mesa/state_tracker/st_atom_framebuffer.c27
1 files changed, 15 insertions, 12 deletions
diff --git a/src/mesa/state_tracker/st_atom_framebuffer.c b/src/mesa/state_tracker/st_atom_framebuffer.c
index 7edd044ad9..f054eb8f21 100644
--- a/src/mesa/state_tracker/st_atom_framebuffer.c
+++ b/src/mesa/state_tracker/st_atom_framebuffer.c
@@ -33,6 +33,7 @@
#include "st_context.h"
#include "st_atom.h"
+#include "st_cb_fbo.h"
#include "pipe/p_context.h"
@@ -44,7 +45,7 @@ static void
update_framebuffer_state( struct st_context *st )
{
struct pipe_framebuffer_state framebuffer;
- struct gl_renderbuffer *rb;
+ struct st_renderbuffer *strb;
GLuint i;
memset(&framebuffer, 0, sizeof(framebuffer));
@@ -54,21 +55,23 @@ update_framebuffer_state( struct st_context *st )
*/
framebuffer.num_cbufs = st->ctx->DrawBuffer->_NumColorDrawBuffers[0];
for (i = 0; i < framebuffer.num_cbufs; i++) {
- rb = st->ctx->DrawBuffer->_ColorDrawBuffers[0][i];
- assert(rb->surface);
- framebuffer.cbufs[i] = rb->surface;
+ strb = st_renderbuffer(st->ctx->DrawBuffer->_ColorDrawBuffers[0][i]);
+ assert(strb->surface);
+ framebuffer.cbufs[i] = strb->surface;
}
- rb = st->ctx->DrawBuffer->_DepthBuffer;
- if (rb) {
- assert(rb->Wrapped->surface);
- framebuffer.zbuf = rb->Wrapped->surface;
+ strb = st_renderbuffer(st->ctx->DrawBuffer->_DepthBuffer);
+ if (strb) {
+ strb = st_renderbuffer(strb->Base.Wrapped);
+ assert(strb->surface);
+ framebuffer.zbuf = strb->surface;
}
- rb = st->ctx->DrawBuffer->_StencilBuffer;
- if (rb) {
- assert(rb->Wrapped->surface);
- framebuffer.sbuf = rb->Wrapped->surface;
+ strb = st_renderbuffer(st->ctx->DrawBuffer->_StencilBuffer);
+ if (strb) {
+ strb = st_renderbuffer(strb->Base.Wrapped);
+ assert(strb->surface);
+ framebuffer.sbuf = strb->surface;
}
if (memcmp(&framebuffer, &st->state.framebuffer, sizeof(framebuffer)) != 0) {