fte/quakespasm
2
0
Fork 0
mirror of https://github.com/Shpoike/Quakespasm.git synced 2025-02-15 08:31:03 +00:00
Code Issues Projects Releases Packages Wiki Activity

Water texture mipmapping support

Browse source
This commit is contained in:
temx 2022-11-01 19:13:06 +01:00 committed by Ozkan Sezer
parent 616e77dc61
commit 226a0e7463
5 changed files with 22 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Quake/gl_model.c
View file

@ -466,6 +466,7 @@ static void Mod_LoadTextures (lump_t *l)
byte *data; byte *data;
extern byte *hunk_base; extern byte *hunk_base;
//johnfitz //johnfitz
unsigned int flags;
//johnfitz -- don't return early if no textures; still need to create dummy texture //johnfitz -- don't return early if no textures; still need to create dummy texture
if (!l->filelen) if (!l->filelen)
@ -585,8 +586,11 @@ static void Mod_LoadTextures (lump_t *l)
Hunk_Alloc (gl_warpimagesize*gl_warpimagesize*4); //make sure hunk is big enough so we don't reach an illegal address Hunk_Alloc (gl_warpimagesize*gl_warpimagesize*4); //make sure hunk is big enough so we don't reach an illegal address
Hunk_FreeToLowMark (mark); Hunk_FreeToLowMark (mark);
q_snprintf (texturename, sizeof(texturename), "%s_warp", texturename); q_snprintf (texturename, sizeof(texturename), "%s_warp", texturename);
flags = TEXPREF_NOPICMIP | TEXPREF_WARPIMAGE;
if (GL_GenerateMipmap)
flags |= TEXPREF_MIPMAP;
tx->warpimage = TexMgr_LoadImage (loadmodel, texturename, gl_warpimagesize, tx->warpimage = TexMgr_LoadImage (loadmodel, texturename, gl_warpimagesize,
gl_warpimagesize, SRC_RGBA, hunk_base, "", (src_offset_t)hunk_base, TEXPREF_NOPICMIP | TEXPREF_WARPIMAGE); gl_warpimagesize, SRC_RGBA, hunk_base, "", (src_offset_t)hunk_base, flags);
tx->update_warp = true; tx->update_warp = true;
} }
else //regular texture else //regular texture

2
Quake/gl_texmgr.c
View file

@ -1051,7 +1051,7 @@ static void TexMgr_LoadImage32 (gltexture_t *glt, unsigned *data)
glTexImage2D (GL_TEXTURE_2D, 0, internalformat, glt->width, glt->height, 0, GL_RGBA, GL_UNSIGNED_BYTE, data); glTexImage2D (GL_TEXTURE_2D, 0, internalformat, glt->width, glt->height, 0, GL_RGBA, GL_UNSIGNED_BYTE, data);
// upload mipmaps // upload mipmaps
if (glt->flags & TEXPREF_MIPMAP) if (glt->flags & TEXPREF_MIPMAP && !(glt->flags & TEXPREF_WARPIMAGE)) // warp image mipmaps are generated later
{ {
mipwidth = glt->width; mipwidth = glt->width;
mipheight = glt->height; mipheight = glt->height;

10
Quake/gl_vidsdl.c
View file

@ -143,6 +143,8 @@ QS_PFNGLUNIFORM1FPROC GL_Uniform1fFunc = NULL; //ericw
QS_PFNGLUNIFORM3FPROC GL_Uniform3fFunc = NULL; //ericw QS_PFNGLUNIFORM3FPROC GL_Uniform3fFunc = NULL; //ericw
QS_PFNGLUNIFORM4FPROC GL_Uniform4fFunc = NULL; //ericw QS_PFNGLUNIFORM4FPROC GL_Uniform4fFunc = NULL; //ericw
QS_PFNGENERATEMIPMAP GL_GenerateMipmap = NULL;
//==================================== //====================================
//johnfitz -- new cvars //johnfitz -- new cvars
@ -1268,6 +1270,14 @@ static void GL_CheckExtensions (void)
{ {
Con_Warning ("GLSL alias model rendering not available, using Fitz renderer\n"); Con_Warning ("GLSL alias model rendering not available, using Fitz renderer\n");
} }
// glGenerateMipmap for warp textures
if (COM_CheckParm("-nowarpmipmaps"))
Con_Warning ("glGenerateMipmap disabled at command line\n");
else if ((GL_GenerateMipmap = SDL_GL_GetProcAddress("glGenerateMipmap")))
Con_Printf ("FOUND: glGenerateMipmap\n");
else
Con_Warning ("glGenerateMipmap not available, liquids won't have mipmaps\n");
} }
/* /*

2
Quake/gl_warp.c
View file

@ -254,6 +254,8 @@ void R_UpdateWarpTextures (void)
//copy to texture //copy to texture
GL_Bind (tx->warpimage); GL_Bind (tx->warpimage);
glCopyTexSubImage2D (GL_TEXTURE_2D, 0, 0, 0, glx, gly+glheight-gl_warpimagesize, gl_warpimagesize, gl_warpimagesize); glCopyTexSubImage2D (GL_TEXTURE_2D, 0, 0, 0, glx, gly+glheight-gl_warpimagesize, gl_warpimagesize, gl_warpimagesize);
if (GL_GenerateMipmap)
GL_GenerateMipmap (GL_TEXTURE_2D);
tx->update_warp = false; tx->update_warp = false;
} }

4
Quake/glquake.h
View file

@ -208,6 +208,7 @@ typedef void (APIENTRYP QS_PFNGLUNIFORM1IPROC) (GLint location, GLint v0);
typedef void (APIENTRYP QS_PFNGLUNIFORM1FPROC) (GLint location, GLfloat v0); typedef void (APIENTRYP QS_PFNGLUNIFORM1FPROC) (GLint location, GLfloat v0);
typedef void (APIENTRYP QS_PFNGLUNIFORM3FPROC) (GLint location, GLfloat v0, GLfloat v1, GLfloat v2); typedef void (APIENTRYP QS_PFNGLUNIFORM3FPROC) (GLint location, GLfloat v0, GLfloat v1, GLfloat v2);
typedef void (APIENTRYP QS_PFNGLUNIFORM4FPROC) (GLint location, GLfloat v0, GLfloat v1, GLfloat v2, GLfloat v3); typedef void (APIENTRYP QS_PFNGLUNIFORM4FPROC) (GLint location, GLfloat v0, GLfloat v1, GLfloat v2, GLfloat v3);
typedef void (APIENTRYP QS_PFNGENERATEMIPMAP) (GLenum type);
extern QS_PFNGLCREATESHADERPROC GL_CreateShaderFunc; extern QS_PFNGLCREATESHADERPROC GL_CreateShaderFunc;
extern QS_PFNGLDELETESHADERPROC GL_DeleteShaderFunc; extern QS_PFNGLDELETESHADERPROC GL_DeleteShaderFunc;
@ -237,6 +238,9 @@ extern qboolean gl_glsl_gamma_able;
extern qboolean gl_glsl_alias_able; extern qboolean gl_glsl_alias_able;
// ericw -- // ericw --
//mipmapped warp textures
extern QS_PFNGENERATEMIPMAP GL_GenerateMipmap;
//ericw -- NPOT texture support //ericw -- NPOT texture support
extern qboolean gl_texture_NPOT; extern qboolean gl_texture_NPOT;