rq3/reaction
0
0
Fork 0
mirror of https://github.com/ReactionQuake3/reaction.git synced 2025-03-26 04:10:50 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix generating render targets.

Browse source
This commit is contained in:
James Canete 2011-07-21 00:41:34 +00:00
parent 76483e3e6c
commit 6030c5a1d4
3 changed files with 63 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
reaction/code/renderer/tr_fbo.c
View file

@ -176,7 +176,7 @@ fboColorBuffer_t *R_FBO_CreateColorBuffer(const char* name, int width, int heigh
else
{
qboolean realmsaa = msaa && tr.fbo.samples > 1;
image_t *texture = R_CreateImage(name, NULL, width, height, mipmap, qfalse, clamp);
image_t *texture = R_CreateRenderTarget(name, width, height, mipmap, clamp);
fboRenderBuffer_t *buf = realmsaa ? R_FBO_CreateRenderBuffer(width, height, texture->internalFormat, qtrue) : NULL;
fboColorBuffer_t *ret = ri.Hunk_Alloc(sizeof(*ret), h_low);

84
reaction/code/renderer/tr_image.c
View file

@ -477,6 +477,50 @@ byte mipBlendColors[16][4] = {
};
static void RenderTarget( int width, int height,
qboolean mipmap,
int *format,
int *pUploadWidth, int *pUploadHeight )
{
GLenum internalFormat = GL_RGB;
if (r_ext_framebuffer_object->integer >= 2 && glRefConfig.textureFloat)
{
internalFormat = GL_RGBA16F_ARB;
qglTexImage2D (GL_TEXTURE_2D, 0, internalFormat, width, height, 0, GL_RGBA, GL_FLOAT, NULL);
}
else
{
internalFormat = GL_RGBA8;
qglTexImage2D (GL_TEXTURE_2D, 0, internalFormat, width, height, 0, GL_RGBA, GL_UNSIGNED_BYTE, NULL);
}
GL_CheckErrors();
*format = internalFormat;
*pUploadWidth = width;
*pUploadHeight = height;
if (mipmap)
{
if ( glRefConfig.textureFilterAnisotropic )
qglTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MAX_ANISOTROPY_EXT,
(GLint)Com_Clamp( 1, glRefConfig.maxAnisotropy, r_ext_max_anisotropy->integer ) );
qglTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, gl_filter_min);
qglTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, gl_filter_max);
}
else
{
if ( glRefConfig.textureFilterAnisotropic )
qglTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MAX_ANISOTROPY_EXT, 1 );
qglTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR );
qglTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR );
}
GL_CheckErrors();
}
/*
===============
Upload32
@ -501,26 +545,6 @@ static void Upload32( unsigned *data,
GLenum internalFormat = GL_RGB;
float rMax = 0, gMax = 0, bMax = 0;
// Makro - no data, this must be a render target
if (!data)
{
if (r_ext_framebuffer_object->integer >= 2 && glRefConfig.textureFloat)
{
internalFormat = GL_RGBA16F_ARB;
qglTexImage2D (GL_TEXTURE_2D, 0, internalFormat, width, height, 0, GL_RGBA, GL_FLOAT, NULL);
}
else
{
internalFormat = GL_RGBA8;
qglTexImage2D (GL_TEXTURE_2D, 0, internalFormat, width, height, 0, GL_RGBA, GL_UNSIGNED_BYTE, NULL);
}
GL_CheckErrors();
*format = internalFormat;
*pUploadWidth = width;
*pUploadHeight = height;
goto done;
}
//
// convert to exact power of 2 sizes
//
@ -974,7 +998,8 @@ at some point in the near future...
================
*/
image_t *R_CreateImage2( const char *name, const byte *pic, int width, int height,
qboolean mipmap, qboolean allowPicmip, int glWrapClampMode, qboolean cube ) {
qboolean mipmap, qboolean allowPicmip, int glWrapClampMode, qboolean cube,
qboolean isRenderTarget) {
image_t *image;
qboolean isLightmap = qfalse;
@ -1026,7 +1051,12 @@ image_t *R_CreateImage2( const char *name, const byte *pic, int width, int heigh
{
GL_Bind(image);
if (pic)
if (isRenderTarget)
{
RenderTarget( image->width, image->height, image->mipmap,
&image->internalFormat, &image->uploadWidth, &image->uploadHeight );
}
else if (pic)
{
Upload32( (unsigned *)pic, image->width, image->height, image->mipmap,
allowPicmip, isLightmap, &image->internalFormat, &image->uploadWidth,
@ -1051,13 +1081,19 @@ image_t *R_CreateImage2( const char *name, const byte *pic, int width, int heigh
image_t *R_CreateImage( const char *name, const byte *pic, int width, int height,
qboolean mipmap, qboolean allowPicmip, int glWrapClampMode )
{
return R_CreateImage2( name, pic, width, height, mipmap, allowPicmip, glWrapClampMode, qfalse);
return R_CreateImage2( name, pic, width, height, mipmap, allowPicmip, glWrapClampMode, qfalse, qfalse);
}
image_t *R_CreateCubeImage( const char *name, const byte *pic, int width, int height,
qboolean mipmap, qboolean allowPicmip, int glWrapClampMode )
{
return R_CreateImage2( name, pic, width, height, mipmap, allowPicmip, glWrapClampMode, qtrue);
return R_CreateImage2( name, pic, width, height, mipmap, allowPicmip, glWrapClampMode, qtrue, qfalse);
}
image_t *R_CreateRenderTarget( const char *name, int width, int height,
qboolean mipmap, int glWrapClampMode )
{
return R_CreateImage2( name, NULL, width, height, mipmap, qfalse, glWrapClampMode, qfalse, qtrue);
}
void R_UpdateSubImage( image_t *image, const byte *pic, int x, int y, int width, int height)

2
reaction/code/renderer/tr_local.h
View file

@ -2083,6 +2083,8 @@ image_t *R_FindImageFile( const char *name, qboolean mipmap, qboolean allowPicm
image_t *R_CreateImage( const char *name, const byte *pic, int width, int height, qboolean mipmap
, qboolean allowPicmip, int wrapClampMode );
image_t *R_CreateRenderTarget( const char *name, int width, int height, qboolean mipmap,
int glWrapClampMode );
void R_UpdateSubImage( image_t *image, const byte *pic, int x, int y, int width, int height);
qboolean R_GetModeInfo( int *width, int *height, float *windowAspect, int mode );