archive/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-07-08 16:01:42 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions

GL: Small simplification.

Browse source
This commit is contained in:
Unknown W. Brackets 2014-05-17 11:29:49 -07:00
parent 0978a1348e
commit b58320d7dc
1 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

10
rpcs3/Emu/GS/GL/GLGSRender.h
View file

@ -83,9 +83,11 @@ public:
void Init(RSXTexture& tex) void Init(RSXTexture& tex)
{ {
Bind(); Bind();
if(!Memory.IsGoodAddr(GetAddress(tex.GetOffset(), tex.GetLocation())))
const u64 texaddr = GetAddress(tex.GetOffset(), tex.GetLocation());
if (!Memory.IsGoodAddr(texaddr))
{ {
ConLog.Error("Bad texture address=0x%x", GetAddress(tex.GetOffset(), tex.GetLocation())); ConLog.Error("Bad texture address=0x%x", texaddr);
return; return;
} }
//ConLog.Warning("texture addr = 0x%x, width = %d, height = %d, max_aniso=%d, mipmap=%d, remap=0x%x, zfunc=0x%x, wraps=0x%x, wrapt=0x%x, wrapr=0x%x, minlod=0x%x, maxlod=0x%x", //ConLog.Warning("texture addr = 0x%x, width = %d, height = %d, max_aniso=%d, mipmap=%d, remap=0x%x, zfunc=0x%x, wraps=0x%x, wrapt=0x%x, wrapr=0x%x, minlod=0x%x, maxlod=0x%x",
@ -96,8 +98,8 @@ public:
int format = tex.GetFormat() & ~(CELL_GCM_TEXTURE_LN | CELL_GCM_TEXTURE_UN); int format = tex.GetFormat() & ~(CELL_GCM_TEXTURE_LN | CELL_GCM_TEXTURE_UN);
bool is_swizzled = !(tex.GetFormat() & CELL_GCM_TEXTURE_LN); bool is_swizzled = !(tex.GetFormat() & CELL_GCM_TEXTURE_LN);
u8* pixels = (u8*)Memory.GetMemFromAddr(GetAddress(tex.GetOffset(), tex.GetLocation())); const u8 *pixels = const_cast<const u8 *>(Memory.GetMemFromAddr(texaddr));
u8* unswizzledPixels; u8 *unswizzledPixels;
static const GLint glRemapStandard[4] = {GL_ALPHA, GL_RED, GL_GREEN, GL_BLUE}; static const GLint glRemapStandard[4] = {GL_ALPHA, GL_RED, GL_GREEN, GL_BLUE};
// NOTE: This must be in ARGB order in all forms below. // NOTE: This must be in ARGB order in all forms below.
const GLint *glRemap = glRemapStandard; const GLint *glRemap = glRemapStandard;