d3d1x: stop using GLX in demos, just use the default visual

3 files changed, 7 insertions, 25 deletions

diff --git a/src/gallium/state_trackers/d3d1x/progs/Makefile b/src/gallium/state_trackers/d3d1x/progs/Makefile
index 4766d3684d0..bb37012a3d7 100644
--- a/src/gallium/state_trackers/d3d1x/progs/Makefile
+++ b/src/gallium/state_trackers/d3d1x/progs/Makefile
@@ -13,7 +13,7 @@ LIBS= \
 	../../../../../lib/libEGL.so
 LIBS_D3D10 = ../dxgid3d10/libdxgid3d10.a ../gd3d10/libgd3d10.a $(LIBS)
 LIBS_D3D11 = ../dxgid3d11/libdxgid3d11.a ../gd3d11/libgd3d11.a $(LIBS)
-LDADD=-lGL -lXext -lXfixes -lX11 -ldrm -ldl
+LDADD=-lXext -lXfixes -lX11 -ldrm -ldl
 
 all: bin/d3d10tri bin/d3d11tri bin/d3d11tex bin/d3d11gears
 include ../Makefile.inc
diff --git a/src/gallium/state_trackers/d3d1x/progs/d3d10app/d3d10x11main.cpp b/src/gallium/state_trackers/d3d1x/progs/d3d10app/d3d10x11main.cpp
index a8f24ae3031..efbe322fe68 100755
--- a/src/gallium/state_trackers/d3d1x/progs/d3d10app/d3d10x11main.cpp
+++ b/src/gallium/state_trackers/d3d1x/progs/d3d10app/d3d10x11main.cpp
@@ -26,7 +26,6 @@
 

 #include "d3d10app.h"

 #include <X11/Xlib.h>

-#include <GL/glx.h>

 #include <galliumdxgi.h>

 #include <sys/time.h>

 

@@ -37,14 +36,6 @@ DXGI_FORMAT format = DXGI_FORMAT_R8G8B8A8_UNORM;
 static ID3D10Device* dev;

 static ID3D10Device* ctx;

 

-static int attributeList[] = {

-		GLX_RGBA,

-		GLX_RED_SIZE, 8,

-		GLX_GREEN_SIZE, 8,

-		GLX_BLUE_SIZE, 8,

-		None

-};

-

 double get_time()

 {

 	struct timeval tv;

@@ -55,15 +46,15 @@ double get_time()
 int main(int argc, char** argv)

 {

 	Display* dpy = XOpenDisplay(0);

-	XVisualInfo* vi = glXChooseVisual(dpy, DefaultScreen(dpy), attributeList);

-	Colormap cmap = XCreateColormap(dpy, RootWindow(dpy, vi->screen), vi->visual, AllocNone);

+	Visual* visual = DefaultVisual(dpy, DefaultScreen(dpy));

+	Colormap cmap = XCreateColormap(dpy, RootWindow(dpy, DefaultScreen(dpy)), visual, AllocNone);

 	XSetWindowAttributes swa;

 	swa.colormap = cmap;

 	swa.border_pixel = 0;

 	swa.event_mask = StructureNotifyMask;

 	width = 512;

 	height = 512;

-	Window win = XCreateWindow(dpy, RootWindow(dpy, vi->screen), 0, 0, width, height, 0, vi->depth, InputOutput, vi->visual, CWBorderPixel | CWColormap| CWEventMask, &swa);

+	Window win = XCreateWindow(dpy, RootWindow(dpy, DefaultScreen(dpy)), 0, 0, width, height, 0, CopyFromParent, InputOutput, visual, CWBorderPixel | CWColormap| CWEventMask, &swa);

 	XMapWindow(dpy, win);

 

 	GalliumDXGIUseX11Display(dpy, 0);

diff --git a/src/gallium/state_trackers/d3d1x/progs/d3d11app/d3d11x11main.cpp b/src/gallium/state_trackers/d3d1x/progs/d3d11app/d3d11x11main.cpp
index 8eb51d36387..1271499c4d3 100755
--- a/src/gallium/state_trackers/d3d1x/progs/d3d11app/d3d11x11main.cpp
+++ b/src/gallium/state_trackers/d3d1x/progs/d3d11app/d3d11x11main.cpp
@@ -1,6 +1,5 @@
 #include "d3d11app.h"

 #include <X11/Xlib.h>

-#include <GL/glx.h>

 #include <galliumdxgi.h>

 #include <sys/time.h>

 

@@ -11,14 +10,6 @@ DXGI_FORMAT format = DXGI_FORMAT_R8G8B8A8_UNORM;
 static ID3D11Device* dev;

 static ID3D11DeviceContext* ctx;

 

-static int attributeList[] = {

-		GLX_RGBA,

-		GLX_RED_SIZE, 8,

-		GLX_GREEN_SIZE, 8,

-		GLX_BLUE_SIZE, 8,

-		None

-};

-

 double get_time()

 {

 	struct timeval tv;

@@ -29,15 +20,15 @@ double get_time()
 int main(int argc, char** argv)

 {

 	Display* dpy = XOpenDisplay(0);

-	XVisualInfo* vi = glXChooseVisual(dpy, DefaultScreen(dpy), attributeList);

-	Colormap cmap = XCreateColormap(dpy, RootWindow(dpy, vi->screen), vi->visual, AllocNone);

+	Visual* visual = DefaultVisual(dpy, DefaultScreen(dpy));

+	Colormap cmap = XCreateColormap(dpy, RootWindow(dpy, DefaultScreen(dpy)), visual, AllocNone);

 	XSetWindowAttributes swa;

 	swa.colormap = cmap;

 	swa.border_pixel = 0;

 	swa.event_mask = StructureNotifyMask;

 	width = 512;

 	height = 512;

-	Window win = XCreateWindow(dpy, RootWindow(dpy, vi->screen), 0, 0, width, height, 0, vi->depth, InputOutput, vi->visual, CWBorderPixel | CWColormap| CWEventMask, &swa);

+	Window win = XCreateWindow(dpy, RootWindow(dpy, DefaultScreen(dpy)), 0, 0, width, height, 0, CopyFromParent, InputOutput, visual, CWBorderPixel | CWColormap| CWEventMask, &swa);

 	XMapWindow(dpy, win);

 

 	GalliumDXGIUseX11Display(dpy, 0);