The-Homebrew-Cloud/dolphin
2
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-06-13 00:58:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

[OGL] Textures now save to PNG not TGA

Browse Source
This commit is contained in:
Matthew Parlane
2013-11-16 15:59:59 +13:00
parent 15bb974224
commit 3a13dfdd9b
8 changed files with 35 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
Source/Core/VideoCommon/Src/ImageWrite.cpp
View File

@ -9,52 +9,6 @@
#include "ImageWrite.h"
#include "FileUtil.h"
#pragma pack(push, 1)
struct TGA_HEADER
{
u8 identsize; // size of ID field that follows 18 u8 header (0 usually)
u8 colourmaptype; // type of colour map 0=none, 1=has palette
u8 imagetype; // type of image 0=none,1=indexed,2=rgb,3=grey,+8=rle packed
s16 colourmapstart; // first colour map entry in palette
s16 colourmaplength; // number of colours in palette
u8 colourmapbits; // number of bits per palette entry 15,16,24,32
s16 xstart; // image x origin
s16 ystart; // image y origin
s16 width; // image width in pixels
s16 height; // image height in pixels
u8 bits; // image bits per pixel 8,16,24,32
u8 descriptor; // image descriptor bits (vh flip bits)
// pixel data follows header
};
#pragma pack(pop)
bool SaveTGA(const char* filename, int width, int height, void* pdata)
{
TGA_HEADER hdr;
File::IOFile f(filename, "wb");
if (!f)
return false;
_assert_(sizeof(TGA_HEADER) == 18 && sizeof(hdr) == 18);
memset(&hdr, 0, sizeof(hdr));
hdr.imagetype = 2;
hdr.bits = 32;
hdr.width = width;
hdr.height = height;
hdr.descriptor |= 8|(1<<5); // 8bit alpha, flip vertical
f.WriteArray(&hdr, 1);
f.WriteBytes(pdata, width * height * 4);
return true;
}
bool SaveData(const char* filename, const char* data)
{
std::ofstream f;
@ -90,7 +44,7 @@ bool TextureToPng(u8* data, int row_stride, const char* filename, int width, int
// Open file for writing (binary mode)
fp = fopen(filename, "wb");
if (fp == NULL) {
PanicAlert("Screenshot failed: Could not open file %s\n", filename);
PanicAlert("Screenshot failed: Could not open file %s %d\n", filename, errno);
goto finalise;
}