OSDN Git Service
(root)
/
android-x86
/
external-mesa.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
5eb9213
)
fix max buffer size test (Kyle Bateman, bug 912828)
author
Brian Paul
<brian.paul@tungstengraphics.com>
Fri, 9 Apr 2004 18:11:45 +0000
(18:11 +0000)
committer
Brian Paul
<brian.paul@tungstengraphics.com>
Fri, 9 Apr 2004 18:11:45 +0000
(18:11 +0000)
src/mesa/drivers/x11/xm_dd.c
patch
|
blob
|
history
diff --git
a/src/mesa/drivers/x11/xm_dd.c
b/src/mesa/drivers/x11/xm_dd.c
index
b58188e
..
ebd75cd
100644
(file)
--- a/
src/mesa/drivers/x11/xm_dd.c
+++ b/
src/mesa/drivers/x11/xm_dd.c
@@
-105,14
+105,8
@@
get_buffer_size( GLframebuffer *buffer, GLuint *width, GLuint *height )
unsigned int winwidth, winheight;
#ifdef XFree86Server
/* XFree86 GLX renderer */
- if (xmBuffer->frontbuffer->width > MAX_WIDTH ||
- xmBuffer->frontbuffer->height > MAX_HEIGHT) {
- winwidth = buffer->Width;
- winheight = buffer->Height;
- } else {
- winwidth = xmBuffer->frontbuffer->width;
- winheight = xmBuffer->frontbuffer->height;
- }
+ winwidth = MIN2(xmBuffer->frontbuffer->width, MAX_WIDTH);
+ winheight = MIN2(xmBuffer->frontbuffer->height, MAX_HEIGHT);
#else
Window root;
int winx, winy;