- sanitized walock.

Sorry, but having a globally writable pointer to every texture is just insane and makes any functional management impossible.
This is merely a preparation for adding a real texture manager. That cannot be done if any code can write over the data at will. For that, it now has to make the texture writable first or create a writable empty texture.
This commit is contained in:
Christoph Oelckers 2019-10-11 23:31:59 +02:00
parent 3621aae3f0
commit fbc22e0125
31 changed files with 185 additions and 193 deletions

View file

@ -646,11 +646,6 @@ static void polymost_drawpoly(vec2f_t const * const dpxy, int32_t const n, int32
setgotpic(globalpicnum);
vec2_t tsiz = { tilesize.x, tilesize.y };
if (!waloff[globalpicnum])
{
tileLoad(globalpicnum);
}
Bassert(n <= MAX_DRAWPOLY_VERTS);
int j = 0;
@ -713,7 +708,7 @@ static void polymost_drawpoly(vec2f_t const * const dpxy, int32_t const n, int32
return;
}
if (!waloff[globalpicnum])
if (!tilePtr(globalpicnum))
{
tsiz.x = tsiz.y = 1;
GLInterface.SetColorMask(false); //Hack to update Z-buffer for invalid mirror textures
@ -900,14 +895,6 @@ static void polymost_drawpoly(vec2f_t const * const dpxy, int32_t const n, int32
GLInterface.SetMatrix(Matrix_Detail, &identity);
}
if (videoGetRenderMode() != REND_POLYMOST)
{
if (!waloff[globalpicnum])
GLInterface.SetColorMask(true);
return;
}
if (skyzbufferhack && skyzbufferhack_pass == 0)
{
vec3d_t const bxtex = xtex, bytex = ytex, botex = otex;
@ -920,7 +907,7 @@ static void polymost_drawpoly(vec2f_t const * const dpxy, int32_t const n, int32
skyzbufferhack_pass--;
}
if (!waloff[globalpicnum])
if (!tilePtr(globalpicnum))
GLInterface.SetColorMask(true);
}