TakeV/dxx-rebirth
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Tighten TGA generation code

Browse source 
- Skip reading unused alpha channel in TGA screenshot path.  The alpha
  channel is discarded, so skip even retrieving it from OpenGL.
- Perform the red/blue swap in place, instead of copying into an
  additional buffer.
This commit is contained in:
Kp 2022-07-02 18:10:45 +00:00
parent 1c8ff1ac0f
commit 173d5559d7
1 changed files with 4 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
similar/arch/ogl/gr.cpp
View file

@ -1136,8 +1136,6 @@ void gr_palette_load( palette_array_t &pal )
reset_computed_colors();
}
#define GL_BGR_EXT 0x80E0
struct TGA_header
{
unsigned char TGAheader[12];
@ -1151,18 +1149,12 @@ void write_bmp(PHYSFS_File *const TGAFile, const unsigned w, const unsigned h)
{
TGA_header TGA;
GLbyte HeightH,HeightL,WidthH,WidthL;
RAIIdmem<uint8_t[]> buf;
const unsigned buffer_size_TGA = w * h * 3;
CALLOC(buf, uint8_t[], buffer_size_TGA);
const auto buf = std::make_unique<uint8_t[]>(buffer_size_TGA);
RAIIdmem<uint8_t[]> rgbaBuf;
CALLOC(rgbaBuf, uint8_t[], w * h * 4);
glReadPixels(0, 0, w, h, GL_RGBA, GL_UNSIGNED_BYTE, rgbaBuf.get());
for(unsigned int pixel = 0; pixel < w * h; pixel++) {
buf[pixel * 3] = rgbaBuf[pixel * 4 + 2];
buf[pixel * 3 + 1] = rgbaBuf[pixel * 4 + 1];
buf[pixel * 3 + 2] = rgbaBuf[pixel * 4];
}
glReadPixels(0, 0, w, h, GL_RGB, GL_UNSIGNED_BYTE, buf.get());
for (const auto pixel : xrange(w * h))
std::swap(buf[pixel * 3], buf[pixel * 3 + 2]);
HeightH = static_cast<GLbyte>(h / 256);
HeightL = static_cast<GLbyte>(h % 256);