- the harmless changes of the failed refactoring of the shader.

This commit is contained in:
Christoph Oelckers 2019-10-06 19:32:35 +02:00
parent e94ed3abf2
commit ef2de97077
11 changed files with 25 additions and 32 deletions

View file

@ -708,7 +708,7 @@ void paletteMakeLookupTable(int32_t palnum, const char *remapbuf, uint8_t r, uin
//
// setbasepal
//
void paletteSetColorTable(int32_t id, uint8_t const * const table)
void paletteSetColorTable(int32_t id, uint8_t const * const table, bool transient)
{
if (basepaltable[id] == NULL)
basepaltable[id] = (uint8_t *) Xmalloc(768);
@ -718,7 +718,7 @@ void paletteSetColorTable(int32_t id, uint8_t const * const table)
#ifdef USE_OPENGL
if (videoGetRenderMode() >= REND_POLYMOST)
{
uploadbasepalette(id);
uploadbasepalette(id, transient);
}
#endif
}
@ -811,6 +811,7 @@ void videoSetPalette(char dabrightness, uint8_t dapalid, uint8_t flags)
g_lastpalettesum = lastpalettesum = newpalettesum;
#if 0
if (videoGetRenderMode() >= REND_POLYMOST)
{
// Only reset the textures if the corresponding preserve flags are clear and
@ -826,6 +827,7 @@ void videoSetPalette(char dabrightness, uint8_t dapalid, uint8_t flags)
if (!(flags&8) && doinvalidate)
gltexinvalidatetype(INVALIDATE_ART_NON_INDEXED);
}
#endif
if ((flags&16)==0)
{