diff options
Diffstat (limited to 'src/egl/main')
| -rw-r--r-- | src/egl/main/Makefile | 16 | ||||
| -rw-r--r-- | src/egl/main/eglconfig.c | 3 | ||||
| -rw-r--r-- | src/egl/main/eglconfigutil.c | 6 | ||||
| -rw-r--r-- | src/egl/main/eglx.c | 7 |
4 files changed, 17 insertions, 15 deletions
diff --git a/src/egl/main/Makefile b/src/egl/main/Makefile index 96742bb4bc..5ee246dc3f 100644 --- a/src/egl/main/Makefile +++ b/src/egl/main/Makefile @@ -46,8 +46,6 @@ OBJECTS = $(SOURCES:.c=.o) # Undefined for now LOCAL_CFLAGS = -D_EGL_PLATFORM_X=1 -LIBS = -lX11 - .c.o: $(CC) -c $(INCLUDE_DIRS) $(CFLAGS) $(LOCAL_CFLAGS) $< -o $@ @@ -61,14 +59,18 @@ default: depend library library: $(TOP)/$(LIB_DIR)/libEGL.so $(TOP)/$(LIB_DIR)/libEGL.so: $(OBJECTS) - $(TOP)/bin/mklib -o EGL -major 1 -minor 0 \ - -install $(TOP)/$(LIB_DIR) -ldl $(OBJECTS) $(LIBS) - + $(MKLIB) -o EGL -linker '$(CC)' -ldflags '$(LDFLAGS)' \ + -major 1 -minor 0 \ + -install $(TOP)/$(LIB_DIR) \ + $(EGL_LIB_DEPS) $(OBJECTS) +install: + $(INSTALL) -d $(DESTDIR)$(INSTALL_LIB_DIR) + $(INSTALL) $(TOP)/$(LIB_DIR)/libEGL.so* $(DESTDIR)$(INSTALL_LIB_DIR) clean: - rm -f *.o *.so* - rm -f core.* + -rm -f *.o *.so* + -rm -f core.* depend: $(SOURCES) $(HEADERS) diff --git a/src/egl/main/eglconfig.c b/src/egl/main/eglconfig.c index b19988f49a..f2f32585c7 100644 --- a/src/egl/main/eglconfig.c +++ b/src/egl/main/eglconfig.c @@ -133,6 +133,9 @@ _eglParseConfigAttribs(_EGLConfig *config, const EGLint *attrib_list) config->Attrib[i] = EGL_DONT_CARE; } + /* by default choose windows unless otherwise specified */ + config->Attrib[EGL_SURFACE_TYPE - FIRST_ATTRIB] = EGL_WINDOW_BIT; + for (i = 0; attrib_list && attrib_list[i] != EGL_NONE; i++) { const EGLint attr = attrib_list[i]; if (attr >= EGL_BUFFER_SIZE && diff --git a/src/egl/main/eglconfigutil.c b/src/egl/main/eglconfigutil.c index db2ff1bfe8..7061df691b 100644 --- a/src/egl/main/eglconfigutil.c +++ b/src/egl/main/eglconfigutil.c @@ -123,7 +123,6 @@ _eglFillInConfigs(_EGLConfig * configs, const GLenum * db_modes, unsigned num_db_modes, int visType) { -#if 0 static const uint8_t bits_table[3][4] = { /* R G B A */ { 5, 6, 5, 0 }, /* Any GL_UNSIGNED_SHORT_5_6_5 */ @@ -214,6 +213,7 @@ _eglFillInConfigs(_EGLConfig * configs, masks = masks_table_rgba[index]; break; +#if 0 case GL_BGR: bits = (bytes_per_pixel[index] == 2) ? bits_table[0] : bits_table[1]; masks = masks_table_bgr[index]; @@ -223,6 +223,7 @@ _eglFillInConfigs(_EGLConfig * configs, bits = (bytes_per_pixel[index] == 2) ? bits_table[0] : bits_table[2]; masks = masks_table_bgra[index]; break; +#endif default: _eglLog(_EGL_WARNING, @@ -253,8 +254,5 @@ _eglFillInConfigs(_EGLConfig * configs, } } return GL_TRUE; -#else - return GL_FALSE; -#endif } diff --git a/src/egl/main/eglx.c b/src/egl/main/eglx.c index 1bba149f70..50acc3a24f 100644 --- a/src/egl/main/eglx.c +++ b/src/egl/main/eglx.c @@ -44,7 +44,7 @@ #include "eglx.h" -static const char *DefaultDRIDriver = "egl_xdri"; +static const char *DefaultGLXDriver = "egl_glx"; static const char *DefaultSoftDriver = "egl_softpipe"; @@ -52,7 +52,7 @@ static const char *DefaultSoftDriver = "egl_softpipe"; * Given an X Display ptr (at dpy->Xdpy) try to determine the appropriate * device driver. Return its name. * - * This boils down to whether to use the egl_xdri.so driver which will + * This boils down to whether to use the egl_glx.so driver which will * load a DRI driver or the egl_softpipe.so driver that'll do software * rendering on Xlib. */ @@ -82,9 +82,8 @@ _xeglChooseDriver(_EGLDisplay *dpy) /* See if we can choose a DRI/DRM driver */ driverName = _eglChooseDRMDriver(screen); if (driverName) { - /* DRI is available */ free((void *) driverName); - driverName = _eglstrdup(DefaultDRIDriver); + driverName = _eglstrdup(DefaultGLXDriver); } else { driverName = _eglstrdup(DefaultSoftDriver); |