projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
tgsi: pass zero vector to texture sampler for 1D case instead of NULL
[mesa.git]
/
progs
/
xdemos
/
glxgears_fbconfig.c
diff --git
a/progs/xdemos/glxgears_fbconfig.c
b/progs/xdemos/glxgears_fbconfig.c
index cadcaeccf8366df641b21d3245bb400884f32780..2dac00b75d1010d3075cf241e66ab3ebfaa0a7b2 100644
(file)
--- a/
progs/xdemos/glxgears_fbconfig.c
+++ b/
progs/xdemos/glxgears_fbconfig.c
@@
-360,19
+360,19
@@
init_fbconfig_functions(Display *dpy, int scrnum)
if ( glx_1_3_supported ) {
choose_fbconfig = (PFNGLXCHOOSEFBCONFIGSGIXPROC) glXGetProcAddressARB(
if ( glx_1_3_supported ) {
choose_fbconfig = (PFNGLXCHOOSEFBCONFIGSGIXPROC) glXGetProcAddressARB(
- (GLbyte *) "glXChooseFBConfig");
+ (GL
u
byte *) "glXChooseFBConfig");
get_visual_from_fbconfig = (PFNGLXGETVISUALFROMFBCONFIGSGIXPROC) glXGetProcAddressARB(
get_visual_from_fbconfig = (PFNGLXGETVISUALFROMFBCONFIGSGIXPROC) glXGetProcAddressARB(
- (GLbyte *) "glXGetVisualFromFBConfig");
+ (GL
u
byte *) "glXGetVisualFromFBConfig");
create_new_context = (PFNGLXCREATECONTEXTWITHCONFIGSGIXPROC) glXGetProcAddressARB(
create_new_context = (PFNGLXCREATECONTEXTWITHCONFIGSGIXPROC) glXGetProcAddressARB(
- (GLbyte *) "glXCreateNewContext");
+ (GL
u
byte *) "glXCreateNewContext");
}
else if ( ext_version_supported ) {
choose_fbconfig = (PFNGLXCHOOSEFBCONFIGSGIXPROC) glXGetProcAddressARB(
}
else if ( ext_version_supported ) {
choose_fbconfig = (PFNGLXCHOOSEFBCONFIGSGIXPROC) glXGetProcAddressARB(
- (GLbyte *) "glXChooseFBConfigSGIX");
+ (GL
u
byte *) "glXChooseFBConfigSGIX");
get_visual_from_fbconfig = (PFNGLXGETVISUALFROMFBCONFIGSGIXPROC) glXGetProcAddressARB(
get_visual_from_fbconfig = (PFNGLXGETVISUALFROMFBCONFIGSGIXPROC) glXGetProcAddressARB(
- (GLbyte *) "glXGetVisualFromFBConfigSGIX");
+ (GL
u
byte *) "glXGetVisualFromFBConfigSGIX");
create_new_context = (PFNGLXCREATECONTEXTWITHCONFIGSGIXPROC) glXGetProcAddressARB(
create_new_context = (PFNGLXCREATECONTEXTWITHCONFIGSGIXPROC) glXGetProcAddressARB(
- (GLbyte *) "glXCreateContextWithConfigSGIX");
+ (GL
u
byte *) "glXCreateContextWithConfigSGIX");
}
else {
printf( "This demo requires either GLX 1.3 or %s be supported.\n",
}
else {
printf( "This demo requires either GLX 1.3 or %s be supported.\n",
@@
-467,7
+467,7
@@
make_window( Display *dpy, const char *name,
None, (char **)NULL, 0, &sizehints);
}
None, (char **)NULL, 0, &sizehints);
}
- ctx = (*create_new_context)(dpy, fbconfig[0], GLX_RGBA_
BIT
, NULL, GL_TRUE);
+ ctx = (*create_new_context)(dpy, fbconfig[0], GLX_RGBA_
TYPE
, NULL, GL_TRUE);
if (!ctx) {
printf("Error: glXCreateNewContext failed\n");
exit(1);
if (!ctx) {
printf("Error: glXCreateNewContext failed\n");
exit(1);
@@
-575,7
+575,7
@@
main(int argc, char *argv[])
dpy = XOpenDisplay(dpyName);
if (!dpy) {
dpy = XOpenDisplay(dpyName);
if (!dpy) {
- printf("Error: couldn't open display %s\n",
dpyName
);
+ printf("Error: couldn't open display %s\n",
XDisplayName(dpyName)
);
return -1;
}
return -1;
}