Impaczus/rpcs3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rsx: fix convert_linear_swizzle converting backwards

Browse Source
This commit is contained in:
Jake
2015-12-02 03:15:43 -06:00
parent 178bcfc8df
commit 19cf749944
2 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
rpcs3/Emu/RSX/Common/TextureUtils.cpp
-1
View File
@@ -134,7 +134,6 @@ write16bTexelsSwizzled(const char *src, char *dst, size_t widthInBlock, size_t h
Result.push_back(currentMipmapLevelInfo); Result.push_back(currentMipmapLevelInfo);
u16 *castedSrc, *castedDst; u16 *castedSrc, *castedDst;
u16 log2width, log2height;
castedSrc = (u16*)src + offsetInSrc; castedSrc = (u16*)src + offsetInSrc;
castedDst = (u16*)dst + offsetInDst; castedDst = (u16*)dst + offsetInDst;
rpcs3/Emu/RSX/RSXThread.h
+5 -5
View File
@@ -121,7 +121,7 @@ namespace rsx
extern u32 method_registers[0x10000 >> 2]; extern u32 method_registers[0x10000 >> 2];
u32 get_vertex_type_size(u32 type); u32 get_vertex_type_size(u32 type);
u32 get_address(u32 offset, u32 location); u32 get_address(u32 offset, u32 location);
@@ -153,9 +153,9 @@ namespace rsx
log2width = log2(width); log2width = log2(width);
log2height = log2(height); log2height = log2(height);
// Max mask possible for square texture (should be 2^11, or 22 bits for x and y) // Max mask possible for square texture
u32 x_mask = 0x555555; u32 x_mask = 0x55555555;
u32 y_mask = 0xAAAAAA; u32 y_mask = 0xAAAAAAAA;
// We have to limit the masks to the lower of the two dimensions to allow for non-square textures // We have to limit the masks to the lower of the two dimensions to allow for non-square textures
u32 limitMask = (log2width < log2height) ? log2width : log2height; u32 limitMask = (log2width < log2height) ? log2width : log2height;
@@ -174,7 +174,7 @@ namespace rsx
T *src, *dst; T *src, *dst;
if (inputIsSwizzled) { if (!inputIsSwizzled) {
for (int y = 0; y < height; ++y) { for (int y = 0; y < height; ++y) {
src = (T *)((T*)inputPixels + y*width); src = (T *)((T*)inputPixels + y*width);
dst = (T *)((T*)outputPixels + offs_y); dst = (T *)((T*)outputPixels + offs_y);