summaryrefslogtreecommitdiff
path: root/src/mesa/drivers/dri
diff options
context:
space:
mode:
authorBrian <brian.paul@tungstengraphics.com>2007-11-03 10:41:03 -0600
committerBrian <brian.paul@tungstengraphics.com>2007-11-05 08:04:48 -0700
commitfc73b216065325fc4ce2c500be5a5fa2072db0b3 (patch)
tree879e0bcc2404e9133763fce0d95efbfb13f9c41d /src/mesa/drivers/dri
parent02a1c8f5690a82dc77db7af381d1b6e4aea67e29 (diff)
rename intelWindowMoved() to intelUpdateWindowSize()
Diffstat (limited to 'src/mesa/drivers/dri')
-rw-r--r--src/mesa/drivers/dri/intel_winsys/intel_context.c14
-rw-r--r--src/mesa/drivers/dri/intel_winsys/intel_swapbuffers.c4
-rw-r--r--src/mesa/drivers/dri/intel_winsys/intel_swapbuffers.h2
3 files changed, 5 insertions, 15 deletions
diff --git a/src/mesa/drivers/dri/intel_winsys/intel_context.c b/src/mesa/drivers/dri/intel_winsys/intel_context.c
index 443276cfc0..8c29a51885 100644
--- a/src/mesa/drivers/dri/intel_winsys/intel_context.c
+++ b/src/mesa/drivers/dri/intel_winsys/intel_context.c
@@ -221,29 +221,19 @@ intelMakeCurrent(__DRIcontextPrivate * driContextPriv,
st_make_current(intel->st, draw_fb, read_fb);
-#if 0
- /* update size of Mesa framebuffer(s) to match window */
- st_resize_framebuffer(draw_fb, driDrawPriv->w, driDrawPriv->h);
- if (driReadPriv != driDrawPriv) {
- st_resize_framebuffer(read_fb, driReadPriv->w, driReadPriv->h);
- }
-#endif
-
if ((intel->driDrawable != driDrawPriv) ||
(intel->lastStamp != driDrawPriv->lastStamp)) {
intel->driDrawable = driDrawPriv;
- intelWindowMoved(driDrawPriv);
+ intelUpdateWindowSize(driDrawPriv);
intel->lastStamp = driDrawPriv->lastStamp;
}
-#if 1
/* The size of the draw buffer will have been updated above.
* If the readbuffer is a different window, check/update its size now.
*/
if (driReadPriv != driDrawPriv) {
- intelWindowMoved(driReadPriv);
+ intelUpdateWindowSize(driReadPriv);
}
-#endif
}
else {
diff --git a/src/mesa/drivers/dri/intel_winsys/intel_swapbuffers.c b/src/mesa/drivers/dri/intel_winsys/intel_swapbuffers.c
index 2db3a29db2..aef3b87bc8 100644
--- a/src/mesa/drivers/dri/intel_winsys/intel_swapbuffers.c
+++ b/src/mesa/drivers/dri/intel_winsys/intel_swapbuffers.c
@@ -223,7 +223,7 @@ intelDisplaySurface(__DRIdrawablePrivate * dPriv,
UNLOCK_HARDWARE(intel);
if (intel->lastStamp != dPriv->lastStamp) {
- intelWindowMoved(dPriv);
+ intelUpdateWindowSize(dPriv);
intel->lastStamp = dPriv->lastStamp;
}
}
@@ -234,7 +234,7 @@ intelDisplaySurface(__DRIdrawablePrivate * dPriv,
* This will be called whenever the currently bound window is moved/resized.
*/
void
-intelWindowMoved(__DRIdrawablePrivate *dPriv)
+intelUpdateWindowSize(__DRIdrawablePrivate *dPriv)
{
struct st_framebuffer *stfb
= (struct st_framebuffer *) dPriv->driverPrivate;
diff --git a/src/mesa/drivers/dri/intel_winsys/intel_swapbuffers.h b/src/mesa/drivers/dri/intel_winsys/intel_swapbuffers.h
index 7bea6e6d40..0d99a771db 100644
--- a/src/mesa/drivers/dri/intel_winsys/intel_swapbuffers.h
+++ b/src/mesa/drivers/dri/intel_winsys/intel_swapbuffers.h
@@ -46,7 +46,7 @@ extern void intelDisplaySurface(__DRIdrawablePrivate * dPriv,
extern void intelSwapBuffers(__DRIdrawablePrivate * dPriv);
-extern void intelWindowMoved(__DRIdrawablePrivate *dPriv);
+extern void intelUpdateWindowSize(__DRIdrawablePrivate *dPriv);
#endif /* INTEL_BUFFERS_H */