qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2025-05-31 08:41:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

[glsl] Remove subpic_t's tnum

Browse source 
It's never actually used (the texture can be fetched using
GLSL_ScrapTexture) and gets in the way of sharing the scrap system with
the vulkan renderer.
This commit is contained in:
Bill Currie 2021-01-12 18:45:44 +09:00
parent db14025935
commit bfbfd7af61
2 changed files with 0 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

1
include/QF/GLSL/qf_textures.h
View file

@ -35,7 +35,6 @@ typedef struct subpic_s {
const struct subpic_s * const next; const struct subpic_s * const next;
const scrap_t * const scrap; const scrap_t * const scrap;
const struct vrect_s * const rect; const struct vrect_s * const rect;
const int tnum; ///< texture number
const int width; ///< requested width const int width; ///< requested width
const int height; ///< requested height const int height; ///< requested height
const float size; ///< size factor for tex coords (mult) const float size; ///< size factor for tex coords (mult)

1
libs/video/renderer/glsl/glsl_textures.c
View file

@ -437,7 +437,6 @@ GLSL_ScrapSubpic (scrap_t *scrap, int width, int height)
scrap->subpics = subpic; scrap->subpics = subpic;
*((scrap_t **) &subpic->scrap) = scrap; *((scrap_t **) &subpic->scrap) = scrap;
*((vrect_t **) &subpic->rect) = rect; *((vrect_t **) &subpic->rect) = rect;
*((int *) &subpic->tnum) = scrap->tnum;
*((int *) &subpic->width) = width; *((int *) &subpic->width) = width;
*((int *) &subpic->height) = height; *((int *) &subpic->height) = height;
*((float *) &subpic->size) = 1.0 / scrap->size; *((float *) &subpic->size) = 1.0 / scrap->size;