projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '7.8'
[mesa.git]
/
src
/
gallium
/
state_trackers
/
glx
/
xlib
/
glx_api.c
diff --git
a/src/gallium/state_trackers/glx/xlib/glx_api.c
b/src/gallium/state_trackers/glx/xlib/glx_api.c
index 2454585850008fc23e8a4e4e1c532eab97af3052..eb8d6a1933397b3295f5e6bf2afc1ab85c7a40cb 100644
(file)
--- a/
src/gallium/state_trackers/glx/xlib/glx_api.c
+++ b/
src/gallium/state_trackers/glx/xlib/glx_api.c
@@
-35,12
+35,9
@@
#include "xm_api.h"
#include "main/context.h"
#include "xm_api.h"
#include "main/context.h"
-#include "main/config.h"
#include "main/macros.h"
#include "main/imports.h"
#include "main/version.h"
#include "main/macros.h"
#include "main/imports.h"
#include "main/version.h"
-#include "state_tracker/st_context.h"
-#include "state_tracker/st_public.h"
/* This indicates the client-side GLX API and GLX encoder version. */
/* This indicates the client-side GLX API and GLX encoder version. */
@@
-1304,7
+1301,7
@@
glXCopyContext( Display *dpy, GLXContext src, GLXContext dst,
if (MakeCurrent_PrevContext == src) {
_mesa_Flush();
}
if (MakeCurrent_PrevContext == src) {
_mesa_Flush();
}
-
st_copy_context_state( xm_src->st, xm_dst->st, (GLuint) mask
);
+
XMesaCopyContext(xm_src, xm_dst, mask
);
}
}
@@
-1761,6
+1758,10
@@
glXGetFBConfigs( Display *dpy, int screen, int *nelements )
}
for (i = 0; i < *nelements; i++) {
results[i] = create_glx_visual(dpy, visuals + i);
}
for (i = 0; i < *nelements; i++) {
results[i] = create_glx_visual(dpy, visuals + i);
+ if (!results[i]) {
+ *nelements = i;
+ break;
+ }
}
return (GLXFBConfig *) results;
}
}
return (GLXFBConfig *) results;
}