rename intelWindowMoved() to intelUpdateWindowSize()

diff --git a/src/mesa/drivers/dri/intel_winsys/intel_context.c b/src/mesa/drivers/dri/intel_winsys/intel_context.c
index 443276cfc0bef9631d7a2e465f2a6a787ec3c8d0..8c29a51885ca4f2a39467d6359841212353d231d 100644 (file)
--- 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 2db3a29db2df42aa1b616b694b355ef9aefaa232..aef3b87bc8644e6df3fef8ac3e2a848ca5642093 100644 (file)
--- 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 7bea6e6d40c9434930e13e2540c587a00971b847..0d99a771db73547762edb2481c91cc800c4c8cf4 100644 (file)
--- 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 */