diff options
| author | Alexander von Gluck IV <[email protected]> | 2014-08-25 21:26:15 +0000 |
|---|---|---|
| committer | Alexander von Gluck IV <[email protected]> | 2014-08-28 21:27:29 -0400 |
| commit | 311b59495c81f26ee3bee4d8c9e36c0ce15be155 (patch) | |
| tree | 72a99e914c9626ce9130ea94368c5eec269f7dae /src/gallium/targets/haiku-softpipe/GalliumContext.cpp | |
| parent | 86d1aa8531fabb41c32c128305af625458c0fa7f (diff) | |
gallium/targets: Break haiku state_tracker out to own directory
Ack'ed by Emil Velikov <[email protected]>
Diffstat (limited to 'src/gallium/targets/haiku-softpipe/GalliumContext.cpp')
| -rw-r--r-- | src/gallium/targets/haiku-softpipe/GalliumContext.cpp | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/src/gallium/targets/haiku-softpipe/GalliumContext.cpp b/src/gallium/targets/haiku-softpipe/GalliumContext.cpp index 7b132604a97..c740458bc72 100644 --- a/src/gallium/targets/haiku-softpipe/GalliumContext.cpp +++ b/src/gallium/targets/haiku-softpipe/GalliumContext.cpp @@ -278,8 +278,8 @@ GalliumContext::CreateContext(Bitmap *bitmap) return -1; } - context->draw = new GalliumFramebuffer(context->stVisual, (void*)this); - context->read = new GalliumFramebuffer(context->stVisual, (void*)this); + context->draw = hgl_create_st_framebuffer(context); + context->read = hgl_create_st_framebuffer(context); if (!context->draw || !context->read) { ERROR("%s: Problem allocating framebuffer!\n", __func__); @@ -448,12 +448,8 @@ GalliumContext::SetCurrentContext(Bitmap *bitmap, context_id contextID) } // We need to lock and unlock framebuffers before accessing them - context->draw->Lock(); - context->read->Lock(); - api->make_current(context->api, context->st, context->draw->fBuffer, - context->read->fBuffer); - context->draw->Unlock(); - context->read->Unlock(); + api->make_current(context->api, context->st, context->draw->stfbi, + context->read->stfbi); if (context->textures[ST_ATTACHMENT_BACK_LEFT] && context->textures[ST_ATTACHMENT_DEPTH_STENCIL] @@ -486,7 +482,7 @@ GalliumContext::SwapBuffers(context_id contextID) } // TODO: Where did st_notify_swapbuffers go? - //st_notify_swapbuffers(context->draw->stfb); + //st_notify_swapbuffers(context->draw->stfbi); context->st->flush(context->st, ST_FLUSH_FRONT, NULL); |