diff options
| author | Alex Deucher <alexdeucher@gmail.com> | 2009-04-10 17:16:08 -0400 |
|---|---|---|
| committer | Alex Deucher <alexdeucher@gmail.com> | 2009-04-10 17:16:08 -0400 |
| commit | 04f335fd16c2a13b9425797acf5c3989cb6def7f (patch) | |
| tree | 9e92cecb0b2ac512fac1fc4ef911878849eaeb42 /src/egl | |
| parent | c0419f190c836130932164ac47cfb53de668d423 (diff) | |
| parent | 5e361c47abf2ee20140628d327eda9b39351d415 (diff) | |
Merge branch 'radeon-rewrite' of git+ssh://agd5f@git.freedesktop.org/git/mesa/mesa into r6xx-rewrite
Diffstat (limited to 'src/egl')
| -rw-r--r-- | src/egl/drivers/dri/Makefile | 3 | ||||
| -rw-r--r-- | src/egl/drivers/glx/Makefile | 3 | ||||
| -rw-r--r-- | src/egl/drivers/xdri/Makefile | 3 | ||||
| -rw-r--r-- | src/egl/main/eglconfigutil.c | 8 |
4 files changed, 10 insertions, 7 deletions
diff --git a/src/egl/drivers/dri/Makefile b/src/egl/drivers/dri/Makefile index be2f9b6bea..4041d5c906 100644 --- a/src/egl/drivers/dri/Makefile +++ b/src/egl/drivers/dri/Makefile @@ -48,7 +48,8 @@ $(TOP)/$(LIB_DIR)/libEGLdri.so: $(OBJECTS) -major 1 -minor 0 \ -install $(TOP)/$(LIB_DIR) -ldl $(OBJECTS) $(LIBS) -install: $(INSTALL) -d $(DESTDIR)$(INSTALL_LIB_DIR) +install: + $(INSTALL) -d $(DESTDIR)$(INSTALL_LIB_DIR) $(INSTALL) $(TOP)/$(LIB_DIR)/libEGLdri.so $(DESTDIR)$(INSTALL_LIB_DIR) clean: diff --git a/src/egl/drivers/glx/Makefile b/src/egl/drivers/glx/Makefile index 090a230ca3..5f041a268f 100644 --- a/src/egl/drivers/glx/Makefile +++ b/src/egl/drivers/glx/Makefile @@ -56,7 +56,8 @@ $(TOP)/$(LIB_DIR)/$(DRIVER_NAME): $(OBJECTS) -install $(TOP)/$(LIB_DIR) \ $(OBJECTS) $(DRM_LIB) $(MISC_LIBS) -install: $(INSTALL) -d $(DESTDIR)$(INSTALL_LIB_DIR) +install: + $(INSTALL) -d $(DESTDIR)$(INSTALL_LIB_DIR) $(INSTALL) $(TOP)/$(LIB_DIR)/$(DRIVER_NAME) $(DESTDIR)$(INSTALL_LIB_DIR) clean: diff --git a/src/egl/drivers/xdri/Makefile b/src/egl/drivers/xdri/Makefile index db4b710002..eb83867b71 100644 --- a/src/egl/drivers/xdri/Makefile +++ b/src/egl/drivers/xdri/Makefile @@ -52,7 +52,8 @@ $(TOP)/$(LIB_DIR)/$(DRIVER_NAME): $(OBJECTS) -install $(TOP)/$(LIB_DIR) \ $(OBJECTS) $(DRM_LIB) $(MISC_LIBS) -install: $(INSTALL) -d $(DESTDIR)$(INSTALL_LIB_DIR) +install: + $(INSTALL) -d $(DESTDIR)$(INSTALL_LIB_DIR) $(INSTALL) $(TOP)/$(LIB_DIR)/$(DRIVER_NAME) $(DESTDIR)$(INSTALL_LIB_DIR) clean: diff --git a/src/egl/main/eglconfigutil.c b/src/egl/main/eglconfigutil.c index 7061df691b..138dc729e7 100644 --- a/src/egl/main/eglconfigutil.c +++ b/src/egl/main/eglconfigutil.c @@ -192,8 +192,8 @@ _eglFillInConfigs(_EGLConfig * configs, if ( bytes_per_pixel[index] == 0 ) { _eglLog(_EGL_INFO, - "[%s:%u] Framebuffer type 0x%04x has 0 bytes per pixel.", - __FUNCTION__, __LINE__, fb_type); + "[_eglFillInConfigs:%u] Framebuffer type 0x%04x has 0 bytes per pixel.", + __LINE__, fb_type); return GL_FALSE; } @@ -227,8 +227,8 @@ _eglFillInConfigs(_EGLConfig * configs, default: _eglLog(_EGL_WARNING, - "[%s:%u] Framebuffer format 0x%04x is not GL_RGB, GL_RGBA, GL_BGR, or GL_BGRA.", - __FUNCTION__, __LINE__, fb_format); + "[_eglFillInConfigs:%u] Framebuffer format 0x%04x is not GL_RGB, GL_RGBA, GL_BGR, or GL_BGRA.", + __LINE__, fb_format); return GL_FALSE; } |