fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-02-02 00:10:33 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Take stride properly into account when setting up window members.

Browse source
This commit is contained in:
Keith Whitwell 2003-01-17 00:56:14 +00:00
parent f0b66442e8
commit 1449a2f759
1 changed files with 13 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/miniglx/miniglx.c
View file

@ -22,7 +22,7 @@
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
/* $Id: miniglx.c,v 1.1.4.33 2003/01/16 23:39:30 keithw Exp $ */
/* $Id: miniglx.c,v 1.1.4.34 2003/01/17 00:56:14 keithw Exp $ */
/**
@ -413,6 +413,11 @@ SetupFBDev( Display *dpy, Window win )
return GL_FALSE;
}
fprintf(stderr, "[miniglx] Setting mode: visible %dx%d virtual %dx%dx%d\n",
dpy->VarInfo.xres, dpy->VarInfo.yres,
dpy->VarInfo.xres_virtual, dpy->VarInfo.yres_virtual,
dpy->VarInfo.bits_per_pixel);
/* set variable screen info */
if (ioctl(dpy->FrameBufferFD, FBIOPUT_VSCREENINFO, &dpy->VarInfo)) {
fprintf(stderr, "error: ioctl(FBIOPUT_VSCREENINFO) failed: %s\n",
@ -891,16 +896,16 @@ XCreateWindow( Display *display, Window parent, int x, int y,
win->bytesPerPixel = display->bpp / 8;
win->rowStride = width * win->bytesPerPixel;
win->size = win->rowStride * height * win->bytesPerPixel; /* XXX stride? */
win->rowStride = display->VarInfo.xres_virtual * win->bytesPerPixel;
win->size = win->rowStride * height; /* XXX stride? */
win->frontStart = display->FrameBuffer;
win->frontBottom = (GLubyte *) win->frontStart
+ (height - 1) * win->rowStride;
win->frontBottom = (GLubyte *) win->frontStart + (height-1) * win->rowStride;
if (visual->glxConfig->doubleBuffer) {
win->backStart = (GLubyte *) win->frontStart + win->size;
win->backStart = (GLubyte *) win->frontStart +
win->rowStride * display->VarInfo.yres_virtual;
win->backBottom = (GLubyte *) win->backStart
+ (height - 1) * win->rowStride;
+ (height - 1) * win->rowStride;
win->curBottom = win->backBottom;
}
else {
@ -913,7 +918,7 @@ XCreateWindow( Display *display, Window parent, int x, int y,
win->driDrawable.private = display->driScreen.createDrawable(display, 0, win,
visual->visInfo->visualid, &(win->driDrawable));
visual->visInfo->visualid, &(win->driDrawable));
if (!win->driDrawable.private) {
fprintf(stderr, "%s: dri.createDrawable failed\n", __FUNCTION__);
RestoreFBDev(display);