mirrors/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-02-02 11:02:28 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix for mii faces in mkwii. efb scaled copy still not fixed. working on it.

Browse Source 
please test

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5928 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Rodolfo Osvaldo Bogado 2010-07-21 02:34:59 +00:00
parent 9f3e2ac2cc
commit 666ff28f80
2 changed files with 30 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Source/Plugins/Plugin_VideoOGL/Src/TextureConverter.cpp
View File

@ -380,11 +380,9 @@ u64 EncodeToRamFromTexture(u32 address,GLuint source_texture,float MValueX,float
int readStride = (expandedWidth * cacheBytes) / TexDecoder_GetBlockWidthInTexels(format); int readStride = (expandedWidth * cacheBytes) / TexDecoder_GetBlockWidthInTexels(format);
EncodeToRamUsingShader(texconv_shader, source_texture, scaledSource, dest_ptr, expandedWidth / samples, expandedHeight, readStride, true, bScaleByHalf > 0); EncodeToRamUsingShader(texconv_shader, source_texture, scaledSource, dest_ptr, expandedWidth / samples, expandedHeight, readStride, true, bScaleByHalf > 0 && !bFromZBuffer);
TextureMngr::MakeRangeDynamic(address,size_in_bytes); TextureMngr::MakeRangeDynamic(address,size_in_bytes);
u64 Hashvalue = 0; return TexDecoder_GetHash64(dest_ptr,size_in_bytes,g_ActiveConfig.iSafeTextureCache_ColorSamples);
Hashvalue = TexDecoder_GetHash64(dest_ptr,size_in_bytes,g_ActiveConfig.iSafeTextureCache_ColorSamples);
return Hashvalue;
} }
void EncodeToRamYUYV(GLuint srcTexture, const TargetRectangle& sourceRc, void EncodeToRamYUYV(GLuint srcTexture, const TargetRectangle& sourceRc,

51
Source/Plugins/Plugin_VideoOGL/Src/TextureMngr.cpp
View File

@ -368,11 +368,9 @@ TextureMngr::TCacheEntry* TextureMngr::Load(int texstage, u32 address, int width
// instead of destroying it and having to create a new one. // instead of destroying it and having to create a new one.
// Might speed up movie playback very, very slightly. // Might speed up movie playback very, very slightly.
TextureisDynamic = (entry.isRenderTarget || entry.isDynamic) && !g_ActiveConfig.bCopyEFBToTexture; TextureisDynamic = (entry.isRenderTarget || entry.isDynamic) && !g_ActiveConfig.bCopyEFBToTexture;
if (!entry.isRenderTarget && ((!entry.isDynamic && if (((!(entry.isRenderTarget || entry.isDynamic) && width == entry.w && height == entry.h && (int)FullFormat == entry.fmt) ||
width == entry.w && height == entry.h && ((entry.isRenderTarget || entry.isDynamic) && entry.w == width && entry.h == height && entry.Scaledw == width && entry.Scaledh == height))
(int)FullFormat == entry.fmt) || && !entry.isRectangle)
(entry.isDynamic &&
entry.w == width && entry.h == height)))
{ {
glBindTexture(entry.isRectangle ? GL_TEXTURE_RECTANGLE_ARB : GL_TEXTURE_2D, entry.texture); glBindTexture(entry.isRectangle ? GL_TEXTURE_RECTANGLE_ARB : GL_TEXTURE_2D, entry.texture);
GL_REPORT_ERRORD(); GL_REPORT_ERRORD();
@ -390,6 +388,7 @@ TextureMngr::TCacheEntry* TextureMngr::Load(int texstage, u32 address, int width
//Make an entry in the table //Make an entry in the table
TCacheEntry& entry = textures[texID]; TCacheEntry& entry = textures[texID];
entry.isDynamic = TextureisDynamic; entry.isDynamic = TextureisDynamic;
entry.isRenderTarget = false;
PC_TexFormat dfmt = PC_TEX_FMT_NONE; PC_TexFormat dfmt = PC_TEX_FMT_NONE;
if (g_ActiveConfig.bHiresTextures) if (g_ActiveConfig.bHiresTextures)
@ -410,6 +409,11 @@ TextureMngr::TCacheEntry* TextureMngr::Load(int texstage, u32 address, int width
entry.scaleY = (float) height / oldHeight; entry.scaleY = (float) height / oldHeight;
} }
} }
else
{
entry.scaleX = 1.0f;
entry.scaleY = 1.0f;
}
if (dfmt == PC_TEX_FMT_NONE) if (dfmt == PC_TEX_FMT_NONE)
dfmt = TexDecoder_Decode(temp, ptr, expandedWidth, expandedHeight, tex_format, tlutaddr, tlutfmt); dfmt = TexDecoder_Decode(temp, ptr, expandedWidth, expandedHeight, tex_format, tlutaddr, tlutfmt);
@ -426,7 +430,6 @@ TextureMngr::TCacheEntry* TextureMngr::Load(int texstage, u32 address, int width
entry.addr = address; entry.addr = address;
entry.size_in_bytes = TexDecoder_GetTextureSizeInBytes(expandedWidth, expandedHeight, tex_format); entry.size_in_bytes = TexDecoder_GetTextureSizeInBytes(expandedWidth, expandedHeight, tex_format);
entry.isRenderTarget = false;
// For static textures, we use NPOT. // For static textures, we use NPOT.
entry.isRectangle = false; entry.isRectangle = false;
@ -760,31 +763,29 @@ void TextureMngr::CopyRenderTargetToTexture(u32 address, bool bFromZBuffer, bool
{ {
_assert_(entry.texture); _assert_(entry.texture);
GL_REPORT_ERRORD(); GL_REPORT_ERRORD();
if (((!entry.isDynamic && entry.Scaledw == Scaledtex_w && entry.Scaledh == Scaledtex_h)
|| (entry.isDynamic && entry.w == w && entry.h == h)) && entry.isRectangle)
{
glBindTexture(GL_TEXTURE_RECTANGLE_ARB, entry.texture);
// for some reason mario sunshine errors here...
// Beyond Good and Evil does too, occasionally.
GL_REPORT_ERRORD();
} else {
// Delete existing texture.
if(entry.isDynamic) if(entry.isDynamic)
{ {
Scaledtex_h = h; Scaledtex_h = h;
Scaledtex_w = w; Scaledtex_w = w;
} }
if (((entry.isRenderTarget || entry.isDynamic) && entry.Scaledw == Scaledtex_w && entry.Scaledh == Scaledtex_h))
{
glBindTexture(entry.isRectangle ? GL_TEXTURE_RECTANGLE_ARB : GL_TEXTURE_2D, entry.texture);
// for some reason mario sunshine errors here...
// Beyond Good and Evil does too, occasionally.
GL_REPORT_ERRORD();
} else {
// Delete existing texture.
glDeleteTextures(1,(GLuint *)&entry.texture); glDeleteTextures(1,(GLuint *)&entry.texture);
glGenTextures(1, (GLuint *)&entry.texture); glGenTextures(1, (GLuint *)&entry.texture);
glBindTexture(GL_TEXTURE_RECTANGLE_ARB, entry.texture); glBindTexture(entry.isDynamic ? GL_TEXTURE_2D : GL_TEXTURE_RECTANGLE_ARB, entry.texture);
glTexImage2D(GL_TEXTURE_RECTANGLE_ARB, 0, gl_iformat, Scaledtex_w, Scaledtex_h, 0, gl_format, gl_type, NULL); glTexImage2D(entry.isDynamic ? GL_TEXTURE_2D : GL_TEXTURE_RECTANGLE_ARB, 0, gl_iformat, Scaledtex_w, Scaledtex_h, 0, gl_format, gl_type, NULL);
GL_REPORT_ERRORD(); GL_REPORT_ERRORD();
entry.isRenderTarget = !entry.isDynamic; entry.isRenderTarget = !entry.isDynamic;
} }
} }
if (!bIsInit || !entry.isRenderTarget) if (!bIsInit)
{ {
glTexParameteri(GL_TEXTURE_RECTANGLE_ARB, GL_TEXTURE_MAG_FILTER, GL_LINEAR); glTexParameteri(GL_TEXTURE_RECTANGLE_ARB, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
glTexParameteri(GL_TEXTURE_RECTANGLE_ARB, GL_TEXTURE_MIN_FILTER, GL_LINEAR); glTexParameteri(GL_TEXTURE_RECTANGLE_ARB, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
@ -798,14 +799,16 @@ void TextureMngr::CopyRenderTargetToTexture(u32 address, bool bFromZBuffer, bool
} }
} }
entry.addr = address;
entry.w = w; entry.w = w;
entry.h = h; entry.h = h;
entry.Scaledw = Scaledtex_w; entry.Scaledw = Scaledtex_w;
entry.Scaledh = Scaledtex_h; entry.Scaledh = Scaledtex_h;
entry.isRectangle = true; entry.isRectangle = !entry.isDynamic;
entry.scaleX = g_ActiveConfig.bCopyEFBScaled ? xScale : 1.0f; entry.scaleX = (g_ActiveConfig.bCopyEFBScaled && !entry.isDynamic) ? xScale : 1.0f;
entry.scaleY = g_ActiveConfig.bCopyEFBScaled ? yScale : 1.0f; entry.scaleY = (g_ActiveConfig.bCopyEFBScaled && !entry.isDynamic) ? yScale : 1.0f;
entry.fmt = copyfmt; entry.fmt = copyfmt;
entry.hash = 0;
// Make sure to resolve anything we need to read from. // Make sure to resolve anything we need to read from.
GLuint read_texture = bFromZBuffer ? g_framebufferManager.ResolveAndGetDepthTarget(source_rect) : g_framebufferManager.ResolveAndGetRenderTarget(source_rect); GLuint read_texture = bFromZBuffer ? g_framebufferManager.ResolveAndGetDepthTarget(source_rect) : g_framebufferManager.ResolveAndGetRenderTarget(source_rect);
@ -856,8 +859,8 @@ void TextureMngr::CopyRenderTargetToTexture(u32 address, bool bFromZBuffer, bool
textures[address].hash = TextureConverter::EncodeToRamFromTexture( textures[address].hash = TextureConverter::EncodeToRamFromTexture(
address, address,
read_texture, read_texture,
Renderer::GetTargetScaleX(), xScale,
Renderer::GetTargetScaleY(), yScale,
bFromZBuffer, bFromZBuffer,
bIsIntensityFmt, bIsIntensityFmt,
copyfmt, copyfmt,