zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2025-02-07 17:11:17 +00:00
Code Issues Projects Releases Packages Wiki Activity

- change swrender mapping to use two buffers/textures and glTexSubImage2D for uploads

Browse source
This commit is contained in:
Magnus Norddahl 2018-06-18 21:15:52 +02:00 committed by Christoph Oelckers
parent 42bb9b7e59
commit 01bda6348e
3 changed files with 27 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/gl/textures/gl_hwtexture.cpp
View file

@ -192,7 +192,8 @@ unsigned int FHardwareTexture::CreateTexture(unsigned char * buffer, int w, int
} }
*/ */
TranslatedTexture * glTex=GetTexID(translation); TranslatedTexture * glTex=GetTexID(translation);
if (glTex->glTexID==0) glGenTextures(1,&glTex->glTexID); bool firstCall = glTex->glTexID == 0;
if (firstCall) glGenTextures(1,&glTex->glTexID);
if (texunit != 0) glActiveTexture(GL_TEXTURE0+texunit); if (texunit != 0) glActiveTexture(GL_TEXTURE0+texunit);
glBindTexture(GL_TEXTURE_2D, glTex->glTexID); glBindTexture(GL_TEXTURE_2D, glTex->glTexID);
FGLDebug::LabelObject(GL_TEXTURE, glTex->glTexID, name); FGLDebug::LabelObject(GL_TEXTURE, glTex->glTexID, name);
@ -256,7 +257,10 @@ unsigned int FHardwareTexture::CreateTexture(unsigned char * buffer, int w, int
sourcetype = GL_BGRA; sourcetype = GL_BGRA;
} }
glTexImage2D(GL_TEXTURE_2D, 0, texformat, rw, rh, 0, sourcetype, GL_UNSIGNED_BYTE, buffer); if (!firstCall && glBufferID > 0)
glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, rw, rh, sourcetype, GL_UNSIGNED_BYTE, buffer);
else
glTexImage2D(GL_TEXTURE_2D, 0, texformat, rw, rh, 0, sourcetype, GL_UNSIGNED_BYTE, buffer);
if (deletebuffer && buffer) free(buffer); if (deletebuffer && buffer) free(buffer);
else if (glBufferID) else if (glBufferID)

32
src/swrenderer/r_swscene.cpp
View file

@ -86,38 +86,40 @@ public:
SWSceneDrawer::SWSceneDrawer() SWSceneDrawer::SWSceneDrawer()
{ {
PaletteTexture = new FSWPaletteTexture; PaletteTexture.reset(new FSWPaletteTexture);
} }
SWSceneDrawer::~SWSceneDrawer() SWSceneDrawer::~SWSceneDrawer()
{ {
if (PaletteTexture != nullptr) delete PaletteTexture;
if (FBTexture != nullptr) delete FBTexture;
} }
sector_t *SWSceneDrawer::RenderView(player_t *player) sector_t *SWSceneDrawer::RenderView(player_t *player)
{ {
// Avoid using the pixel buffer from the last frame
FBTextureIndex = (FBTextureIndex + 1) % 2;
auto &fbtex = FBTexture[FBTextureIndex];
DCanvas buffer(screen->GetWidth(), screen->GetHeight(), V_IsTrueColor()); DCanvas buffer(screen->GetWidth(), screen->GetHeight(), V_IsTrueColor());
if (FBTexture == nullptr || FBTexture->SystemTexture[0] == nullptr || if (fbtex == nullptr || fbtex->SystemTexture[0] == nullptr ||
FBTexture->GetWidth() != screen->GetWidth() || fbtex->GetWidth() != screen->GetWidth() ||
FBTexture->GetHeight() != screen->GetHeight() || fbtex->GetHeight() != screen->GetHeight() ||
(V_IsTrueColor() ? 1:0) != FBTexture->WidthBits) (V_IsTrueColor() ? 1:0) != fbtex->WidthBits)
{ {
// This manually constructs its own material here. // This manually constructs its own material here.
if (FBTexture != nullptr) delete FBTexture; fbtex.reset();
FBTexture = new FSWSceneTexture(screen->GetWidth(), screen->GetHeight(), V_IsTrueColor()); fbtex.reset(new FSWSceneTexture(screen->GetWidth(), screen->GetHeight(), V_IsTrueColor()));
FBTexture->SystemTexture[0]->AllocateBuffer(screen->GetWidth(), screen->GetHeight(), V_IsTrueColor() ? 4 : 1); fbtex->SystemTexture[0]->AllocateBuffer(screen->GetWidth(), screen->GetHeight(), V_IsTrueColor() ? 4 : 1);
auto mat = FMaterial::ValidateTexture(FBTexture, false); auto mat = FMaterial::ValidateTexture(fbtex.get(), false);
mat->AddTextureLayer(PaletteTexture); mat->AddTextureLayer(PaletteTexture.get());
} }
auto buf = FBTexture->SystemTexture[0]->MapBuffer(); auto buf = fbtex->SystemTexture[0]->MapBuffer();
if (!buf) I_FatalError("Unable to map buffer for software rendering"); if (!buf) I_FatalError("Unable to map buffer for software rendering");
buffer.SetBuffer(screen->GetWidth(), screen->GetHeight(), screen->GetWidth(), buf); buffer.SetBuffer(screen->GetWidth(), screen->GetHeight(), screen->GetWidth(), buf);
SWRenderer->RenderView(player, &buffer); SWRenderer->RenderView(player, &buffer);
FBTexture->SystemTexture[0]->CreateTexture(nullptr, screen->GetWidth(), screen->GetHeight(), 0, false, 0, "swbuffer"); fbtex->SystemTexture[0]->CreateTexture(nullptr, screen->GetWidth(), screen->GetHeight(), 0, false, 0, "swbuffer");
auto map = swrenderer::CameraLight::Instance()->ShaderColormap(); auto map = swrenderer::CameraLight::Instance()->ShaderColormap();
screen->DrawTexture(FBTexture, 0, 0, DTA_SpecialColormap, map, TAG_DONE); screen->DrawTexture(fbtex.get(), 0, 0, DTA_SpecialColormap, map, TAG_DONE);
SWRenderer->DrawRemainingPlayerSprites(); SWRenderer->DrawRemainingPlayerSprites();
return r_viewpoint.sector; return r_viewpoint.sector;
} }

6
src/swrenderer/r_swscene.h
View file

@ -6,13 +6,15 @@
#include "hwrenderer/scene/hw_clipper.h" #include "hwrenderer/scene/hw_clipper.h"
#include "r_utility.h" #include "r_utility.h"
#include "c_cvars.h" #include "c_cvars.h"
#include <memory>
class FSWSceneTexture; class FSWSceneTexture;
class SWSceneDrawer class SWSceneDrawer
{ {
FTexture *PaletteTexture = nullptr; std::unique_ptr<FTexture> PaletteTexture;
FSWSceneTexture *FBTexture = nullptr; std::unique_ptr<FSWSceneTexture> FBTexture[2];
int FBTextureIndex = 0;
bool FBIsTruecolor = false; bool FBIsTruecolor = false;
public: public: