diff options
| author | Brian Paul <[email protected]> | 2006-03-26 05:22:17 +0000 |
|---|---|---|
| committer | Brian Paul <[email protected]> | 2006-03-26 05:22:17 +0000 |
| commit | ea4fe661d7f3a95d9db17e1475076f1badf8e1a6 (patch) | |
| tree | ffc663f1a02dea07254e08620f8ad872fb1a3e20 /src/mesa/drivers | |
| parent | 4cbd16ed3ffecd743b4921fab3a65f8510d151c9 (diff) | |
merge from texman branchmesa_20060325
Diffstat (limited to 'src/mesa/drivers')
| -rw-r--r-- | src/mesa/drivers/common/driverfuncs.c | 3 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/Makefile.template | 2 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/common/dri_util.c | 2 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/common/drirenderbuffer.c | 4 |
4 files changed, 7 insertions, 4 deletions
diff --git a/src/mesa/drivers/common/driverfuncs.c b/src/mesa/drivers/common/driverfuncs.c index 7f577b6e7f6..9838e0b5ec0 100644 --- a/src/mesa/drivers/common/driverfuncs.c +++ b/src/mesa/drivers/common/driverfuncs.c @@ -206,7 +206,8 @@ _mesa_init_driver_functions(struct dd_function_table *driver) #if FEATURE_EXT_framebuffer_object driver->NewFramebuffer = _mesa_new_framebuffer; driver->NewRenderbuffer = _mesa_new_soft_renderbuffer; - driver->RenderbufferTexture = _mesa_renderbuffer_texture; + driver->RenderTexture = _mesa_render_texture; + driver->FinishRenderTexture = _mesa_finish_render_texture; driver->FramebufferRenderbuffer = _mesa_framebuffer_renderbuffer; #endif diff --git a/src/mesa/drivers/dri/Makefile.template b/src/mesa/drivers/dri/Makefile.template index 35f7fd8a129..9e1b36252ff 100644 --- a/src/mesa/drivers/dri/Makefile.template +++ b/src/mesa/drivers/dri/Makefile.template @@ -89,7 +89,7 @@ $(LIB_DIR)/$(LIBNAME): $(LIBNAME) depend: $(C_SOURCES) $(ASM_SOURCES) $(SYMLINKS) touch depend $(MKDEP) $(MKDEP_OPTIONS) $(DEFINES) $(INCLUDES) $(C_SOURCES) $(ASM_SOURCES) \ - > /dev/null + >& /dev/null # Emacs tags diff --git a/src/mesa/drivers/dri/common/dri_util.c b/src/mesa/drivers/dri/common/dri_util.c index 883a89c8886..bad7073ed8b 100644 --- a/src/mesa/drivers/dri/common/dri_util.c +++ b/src/mesa/drivers/dri/common/dri_util.c @@ -831,7 +831,7 @@ static void driDestroyScreen(__DRInativeDisplay *dpy, int scrn, void *screenPriv (void)drmUnmap((drmAddress)psp->pSAREA, SAREA_MAX); (void)drmUnmap((drmAddress)psp->pFB, psp->fbSize); _mesa_free(psp->pDevPriv); - (void)drmClose(psp->fd); + (void)drmCloseOnce(psp->fd); if ( psp->modes != NULL ) { (*dri_interface->destroyContextModes)( psp->modes ); } diff --git a/src/mesa/drivers/dri/common/drirenderbuffer.c b/src/mesa/drivers/dri/common/drirenderbuffer.c index 29ba1ea8a30..990f71450db 100644 --- a/src/mesa/drivers/dri/common/drirenderbuffer.c +++ b/src/mesa/drivers/dri/common/drirenderbuffer.c @@ -56,6 +56,8 @@ driNewRenderbuffer(GLenum format, GLvoid *addr, driRenderbuffer *drb; assert(format == GL_RGBA || + format == GL_RGB5 || + format == GL_RGBA8 || format == GL_DEPTH_COMPONENT16 || format == GL_DEPTH_COMPONENT24 || format == GL_DEPTH_COMPONENT32 || @@ -75,7 +77,7 @@ driNewRenderbuffer(GLenum format, GLvoid *addr, drb->Base.InternalFormat = format; - if (format == GL_RGBA) { + if (format == GL_RGBA || format == GL_RGB5 || format == GL_RGBA8) { /* Color */ drb->Base._BaseFormat = GL_RGBA; drb->Base.DataType = GL_UNSIGNED_BYTE; |