Attachment 3223 Details for Bug 4218 – updated patch for ASM_API

[patch] updated patch for ASM_API

mesa-egl-dispatch.patch (text/plain), 4.15 KB, created by George - on 2005-09-10 14:34:07 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: George -

Created: 2005-09-10 14:34:07 UTC

Size: 4.15 KB

patch

obsolete

>Index: src/egl/main/Makefile
>===================================================================
>RCS file: /cvs/mesa/Mesa/src/egl/main/Makefile,v
>retrieving revision 1.1
>diff -u -r1.1 Makefile
>--- src/egl/main/Makefile	22 Apr 2005 21:09:39 -0000	1.1
>+++ src/egl/main/Makefile	10 Sep 2005 20:59:53 -0000
>@@ -3,6 +3,7 @@
> TOP = ../../..
> include $(TOP)/configs/current
> 
>+DEFINES += -UIN_DRI_DRIVER
> 
> INCLUDE_DIRS = -I$(TOP)/include -I$(TOP)/src/mesa/glapi
> 
>@@ -29,11 +30,20 @@
> 	eglscreen.c \
> 	eglsurface.c
> 
>-OBJECTS = $(SOURCES:.c=.o)
>+include $(TOP)/src/mesa/sources
>+
>+MESA_ASM_API = $(addprefix $(TOP)/src/mesa/, $(ASM_API))
>+MESA_GLAPI_SOURCES = $(addprefix $(TOP)/src/mesa/, $(GLAPI_SOURCES))
>+MESA_GLAPI_OBJECTS = $(addprefix $(TOP)/src/mesa/, $(GLAPI_OBJECTS))
>+
>+OBJECTS = $(SOURCES:.c=.o) $(MESA_GLAPI_OBJECTS)
> 
> 
> .c.o:
>-	$(CC) -c $(INCLUDE_DIRS) $(CFLAGS) $< -o $@
>+	$(CC) -c $(INCLUDE_DIRS) $(CFLAGS) $(DEFINES) $< -o $@
>+
>+.S.o:
>+	$(CC) -c $(INCLUDE_DIRS) $(CFLAGS) $(DEFINES) $< -o $@
> 
> 
> 
>@@ -45,7 +55,7 @@
> 
> $(LIB_DIR)/libEGL.so: $(OBJECTS)
> 	$(TOP)/bin/mklib -o EGL -major 1 -minor 0 \
>-		-install $(LIB_DIR) -ldl $(OBJECTS)
>+		-install $(LIB_DIR) -ldl -lpthread $(OBJECTS)
> 
> 
> 
>@@ -54,11 +64,12 @@
> 	rm -f core.*
> 
> 
>-depend: $(SOURCES) $(HEADERS)
>+depend: $(SOURCES) $(HEADERS) $(MESA_GLAPI_SOURCES) $(MESA_ASM_API)
> 	@ echo "running $(MKDEP)"
> 	@ touch depend
> 	$(MKDEP) $(MKDEP_OPTIONS) $(DEFINES) $(INCLUDE_DIRS) \
>-		$(SOURCES) $(HEADERS) > /dev/null 
>+		$(SOURCES) $(HEADERS) \
>+		$(MESA_GLAPI_SOURCES) $(MESA_ASM_API) > /dev/null 
> 
> include depend
> # DO NOT DELETE
>Index: progs/egl/Makefile
>===================================================================
>RCS file: /cvs/mesa/Mesa/progs/egl/Makefile,v
>retrieving revision 1.6
>diff -u -r1.6 Makefile
>--- progs/egl/Makefile	21 Aug 2005 03:17:52 -0000	1.6
>+++ progs/egl/Makefile	10 Sep 2005 21:00:02 -0000
>@@ -32,14 +32,14 @@
> 
> 
> demo2: demo2.o $(LIB_DIR)/libEGL.so
>-	$(CC) $(CFLAGS) demo2.o -L$(LIB_DIR) -lEGL $(LIBDRM_LIB) $(APP_LIB_DEPS) -o $@
>+	$(CC) $(CFLAGS) demo2.o -L$(LIB_DIR) -lEGL $(LIBDRM_LIB) -o $@
> 
> demo2.o: demo2.c $(HEADERS)
> 	$(CC) -c $(CFLAGS) -I$(TOP)/include demo2.c
> 
> 
> demo3: demo3.o $(LIB_DIR)/libEGL.so
>-	$(CC) $(CFLAGS) demo3.o -L$(LIB_DIR) -lEGL $(LIBDRM_LIB) $(APP_LIB_DEPS) -o $@
>+	$(CC) $(CFLAGS) demo3.o -L$(LIB_DIR) -lEGL $(LIBDRM_LIB) -o $@
> 
> demo3.o: demo3.c $(HEADERS)
> 	$(CC) -c $(CFLAGS) -I$(TOP)/include demo3.c
>@@ -53,7 +53,7 @@
> 
> 
> eglgears: eglgears.o $(LIB_DIR)/libEGL.so
>-	$(CC) $(CFLAGS) eglgears.o -L$(LIB_DIR) -lEGL $(LIBDRM_LIB) $(APP_LIB_DEPS) -o $@
>+	$(CC) $(CFLAGS) eglgears.o -L$(LIB_DIR) -lEGL $(LIBDRM_LIB) -o $@
> 
> eglgears.o: eglgears.c $(HEADERS)
> 	$(CC) -c $(CFLAGS) -I$(TOP)/include eglgears.c
>Index: progs/egl/demo1.c
>===================================================================
>RCS file: /cvs/mesa/Mesa/progs/egl/demo1.c,v
>retrieving revision 1.5
>diff -u -r1.5 demo1.c
>--- progs/egl/demo1.c	16 Jun 2005 04:25:45 -0000	1.5
>+++ progs/egl/demo1.c	10 Sep 2005 21:00:02 -0000
>@@ -92,6 +92,9 @@
>    EGLContext ctx;
>    EGLSurface pbuffer;
>    EGLConfig configs[10];
>+   EGLScreenMESA screen;
>+   EGLModeMESA mode;
>+   EGLint numConfigs, count;
>    EGLBoolean b;
>    const EGLint pbufAttribs[] = {
>       EGL_WIDTH, 500,
>@@ -113,6 +116,10 @@
>    printf("EGL version = %d.%d\n", maj, min);
>    printf("EGL_VENDOR = %s\n", eglQueryString(d, EGL_VENDOR));
> 
>+   eglGetConfigs(d, configs, 10, &numConfigs);
>+   eglGetScreensMESA(d, &screen, 1, &count);
>+   eglGetModesMESA(d, screen, &mode, 1, &count);
>+
>    PrintConfigs(d);
> 
>    ctx = eglCreateContext(d, configs[0], EGL_NO_CONTEXT, NULL);
>Index: progs/egl/demo2.c
>===================================================================
>RCS file: /cvs/mesa/Mesa/progs/egl/demo2.c,v
>retrieving revision 1.4
>diff -u -r1.4 demo2.c
>--- progs/egl/demo2.c	20 May 2005 14:02:02 -0000	1.4
>+++ progs/egl/demo2.c	10 Sep 2005 21:00:02 -0000
>@@ -24,8 +24,6 @@
> 
> static void redraw(EGLDisplay dpy, EGLSurface surf, int rot)
> {
>-   printf("Redraw event\n");
>-
> #ifdef FRONTBUFFER
>     glDrawBuffer( GL_FRONT ); 
> #else
>@@ -177,8 +175,6 @@
>    
>    for (i = 0; i < 6; i++) {
>       redraw(d, screen_surf, i*10 );
>-
>-      printf("sleep(1)\n");   
>       sleep(1);  
>    }
>

Actions: View | Splinter Review

Attachments on bug 4218: 3012 | 3013 | 3223 | 3224

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.