[Mesa-dev] [PATCH 21/27] dri: Stop using driUpdateFramebufferSize() wrapper function
Kristian Høgsberg
krh at bitplanet.net
Fri Oct 28 15:11:51 PDT 2011
---
src/mesa/drivers/dri/intel/intel_context.c | 3 +--
.../drivers/dri/radeon/radeon_common_context.c | 10 ++++++----
2 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/src/mesa/drivers/dri/intel/intel_context.c b/src/mesa/drivers/dri/intel/intel_context.c
index 6190396..476f9dc 100644
--- a/src/mesa/drivers/dri/intel/intel_context.c
+++ b/src/mesa/drivers/dri/intel/intel_context.c
@@ -54,7 +54,6 @@
#include "intel_bufmgr.h"
#include "intel_screen.h"
-#include "drirenderbuffer.h"
#include "utils.h"
#include "../glsl/ralloc.h"
@@ -377,7 +376,7 @@ intel_update_renderbuffers(__DRIcontext *context, __DRIdrawable *drawable)
if (attachments)
free(attachments);
- driUpdateFramebufferSize(&intel->ctx, drawable);
+ intel->ctx.Driver.ResizeBuffers(&intel->ctx, fb, drawable->w, drawable->h);
}
/**
diff --git a/src/mesa/drivers/dri/radeon/radeon_common_context.c b/src/mesa/drivers/dri/radeon/radeon_common_context.c
index 5c2623b..d421685 100644
--- a/src/mesa/drivers/dri/radeon/radeon_common_context.c
+++ b/src/mesa/drivers/dri/radeon/radeon_common_context.c
@@ -35,7 +35,6 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include "radeon_common.h"
#include "xmlpool.h" /* for symbolic values of enum-type options */
#include "utils.h"
-#include "drirenderbuffer.h"
#include "drivers/common/meta.h"
#include "main/context.h"
#include "main/framebuffer.h"
@@ -625,7 +624,8 @@ radeon_update_renderbuffers(__DRIcontext *context, __DRIdrawable *drawable,
}
}
- driUpdateFramebufferSize(radeon->glCtx, drawable);
+ radeon->glCtx->Driver.ResizeBuffers(radeon->glCtx,
+ &draw->base, drawable->w, drawable->h);
}
/* Force the context `c' to be the current context and associate with it
@@ -669,9 +669,11 @@ GLboolean radeonMakeCurrent(__DRIcontext * driContextPriv,
fprintf(stderr, "%s ctx %p dfb %p rfb %p\n", __FUNCTION__, radeon->glCtx, drfb, readfb);
if(driDrawPriv)
- driUpdateFramebufferSize(radeon->glCtx, driDrawPriv);
+ radeon->glCtx->Driver.ResizeBuffers(radeon->glCtx,
+ drfb, driDrawPriv->w, driDrawPriv->h);
if (driReadPriv != driDrawPriv)
- driUpdateFramebufferSize(radeon->glCtx, driReadPriv);
+ radeon->glCtx->Driver.ResizeBuffers(radeon->glCtx,
+ readfb, driReadPriv->w, driReadPriv->h);
_mesa_make_current(radeon->glCtx, drfb, readfb);
if (driDrawPriv == NULL && driReadPriv == NULL)
--
1.7.7
More information about the mesa-dev
mailing list