[mupen64plus-video-rice] 79/191: Remove upstream merged patches
Sven Eckelmann
ecsv-guest at moszumanska.debian.org
Thu Nov 26 06:17:20 UTC 2015
This is an automated email from the git hooks/post-receive script.
ecsv-guest pushed a commit to branch armhf_test
in repository mupen64plus-video-rice.
commit 4613adc5eba06d065121070b4a9467f6f42aa93f
Author: Sven Eckelmann <sven at narfation.org>
Date: Sun Aug 28 20:01:23 2011 +0200
Remove upstream merged patches
---
debian/changelog | 6 +
debian/patches/divide_by_zero.patch | 19 --
debian/patches/highres_memcorruption.patch | 74 ------
debian/patches/infinit_loop.patch | 26 ---
debian/patches/mipmapping.patch | 139 -----------
debian/patches/png_truecolor_conversation.patch | 50 ----
debian/patches/portable_movsxl.patch | 34 ---
debian/patches/rewrite_makefile.patch | 294 ------------------------
debian/patches/series | 10 -
debian/patches/undefined_functions.patch | 117 ----------
debian/patches/wom_corruption.patch | 70 ------
debian/patches/z_coordinate_lines.patch | 20 --
12 files changed, 6 insertions(+), 853 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 331a63c..70c8221 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,12 @@ mupen64plus-video-rice (1.99.5~hg20110828-1) UNRELEASED; urgency=low
* debian/control:
- Add virtual package libsdl-dev as alternative build dependency
* Don't mix implicit and explicit rules to prevent FTBFS with make 3.82
+ * debian/patches:
+ - Remove upstream merged patches divide_by_zero.patch,
+ highres_memcorruption.patch, infinit_loop.patch, mipmapping.patch,
+ png_truecolor_conversation.patch, portable_movsxl.patch,
+ rewrite_makefile.patch, undefined_functions.patch, wom_corruption.patch,
+ z_coordinate_lines.patch
-- Sven Eckelmann <sven at narfation.org> Sun, 28 Aug 2011 19:01:03 +0200
diff --git a/debian/patches/divide_by_zero.patch b/debian/patches/divide_by_zero.patch
deleted file mode 100644
index dceb0fe..0000000
--- a/debian/patches/divide_by_zero.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Description: Fix random crash due to divide-by-zero error
-Origin: upstream, https://bitbucket.org/richard42/mupen64plus-video-rice/changeset/d53deb285eb9
-Author: Richard Goedeken <Richard at fascinationsoftware.com>
-
----
-diff --git a/src/TextureFilters.cpp b/src/TextureFilters.cpp
-index 22ae445b3a53079387f418be3f7ca05040c7cfed..9641e1746deab2ee81c0f113915ee32dc192d905 100644
---- a/src/TextureFilters.cpp
-+++ b/src/TextureFilters.cpp
-@@ -1378,7 +1378,8 @@ int FindScaleFactor(const ExtTxtrInfo &info, TxtrCacheEntry &entry)
-
- int CheckTextureInfos( CSortedList<uint64,ExtTxtrInfo> &infos, TxtrCacheEntry &entry, int &indexa, int &scaleShift, bool bForDump = false)
- {
-- if(entry.ti.WidthToCreate/entry.ti.WidthToLoad > 2 || entry.ti.HeightToCreate/entry.ti.HeightToLoad > 2 )
-+ if ((entry.ti.WidthToLoad != 0 && entry.ti.WidthToCreate / entry.ti.WidthToLoad > 2) ||
-+ (entry.ti.HeightToLoad != 0 && entry.ti.HeightToCreate / entry.ti.HeightToLoad > 2 ))
- {
- //DebugMessage(M64MSG_WARNING, "Hires texture does not support extreme texture replication");
- return -1;
diff --git a/debian/patches/highres_memcorruption.patch b/debian/patches/highres_memcorruption.patch
deleted file mode 100644
index 63f3cdf..0000000
--- a/debian/patches/highres_memcorruption.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-Description: Scale highres textures by precalculated scaleShift exponent
- The highres textures should be created in a buffer with the size calculated
- from the desired native size and the size of the highres texture. The size
- used here should be 2**scaleShift as calculated by FindScaleFactor. This
- information is later used to correctly clamp and mirror textures. Therefore,
- (2**scaleShift)*(Width|Height)ToCreate is the size of the final texture and
- (2**scaleShift)*(Width|Height)ToLoad is the size of the texture information
- which are loaded from the external image. The mirror factor is already part of
- the (Width|Height)ToCreate value and it must not be multiplied by it again to
- get the texture buffer size.
- .
- Doing it differently will result in segfaults or corrupted textures.
-Origin: backport, https://bitbucket.org/richard42/mupen64plus-video-rice/changeset/d1cc49eac47d
-Author: Sven Eckelmann <sven at narfation.org>
-
----
-diff --git a/src/TextureFilters.cpp b/src/TextureFilters.cpp
-index e6adc5e115ac8b368544f974d2ca598366caa04c..3b728c78c463d4bae8965689189c57fbab5b4c1c 100644
---- a/src/TextureFilters.cpp
-+++ b/src/TextureFilters.cpp
-@@ -1288,6 +1288,7 @@ void FindAllHiResTextures(void)
- gHiresTxtrInfos.clear();
- if (!osal_is_directory(foldername))
- {
-+ DebugMessage(M64MSG_WARNING, "Couldn't open hi-res texture directory: %s", foldername);
- return;
- }
- else
-@@ -1849,15 +1850,14 @@ void LoadHiresTexture( TxtrCacheEntry &entry )
- }
-
- // calculate the texture size magnification by comparing the N64 texture size and the hi-res texture size
-- int scalex = width / (int)entry.ti.WidthToCreate;
-- int scaley = height / (int)entry.ti.HeightToCreate;
-+ int scale = 1 << scaleShift;
- int mirrorx = 1;
- int mirrory = 1;
- if (entry.ti.WidthToCreate/entry.ti.WidthToLoad == 2) mirrorx = 2;
- if (entry.ti.HeightToCreate/entry.ti.HeightToLoad == 2) mirrory = 2;
-- entry.pEnhancedTexture = CDeviceBuilder::GetBuilder()->CreateTexture(entry.ti.WidthToCreate*scalex*mirrorx, entry.ti.HeightToCreate*scaley*mirrory);
-+ entry.pEnhancedTexture = CDeviceBuilder::GetBuilder()->CreateTexture(entry.ti.WidthToCreate*scale, entry.ti.HeightToCreate*scale);
- DrawInfo info;
--
-+
- if( entry.pEnhancedTexture && entry.pEnhancedTexture->StartUpdate(&info) )
- {
-
-@@ -1913,22 +1913,22 @@ void LoadHiresTexture( TxtrCacheEntry &entry )
-
- if (mirrorx == 2)
- {
-- //printf("Mirror: ToCreate: (%d,%d) ToLoad: (%d,%d) Scale: (%i,%i) Mirror: (%i,%i) Size: (%i,%i) Mask: %i\n", entry.ti.WidthToCreate, entry.ti.HeightToCreate, entry.ti.WidthToLoad, entry.ti.HeightToLoad, scalex, scaley, mirrorx, mirrory, width, height, entry.ti.maskS+scaleShift);
-+ //printf("Mirror: ToCreate: (%d,%d) ToLoad: (%d,%d) Scale: (%i,%i) Mirror: (%i,%i) Size: (%i,%i) Mask: %i\n", entry.ti.WidthToCreate, entry.ti.HeightToCreate, entry.ti.WidthToLoad, entry.ti.HeightToLoad, scale, scale, mirrorx, mirrory, width, height, entry.ti.maskS+scaleShift);
- gTextureManager.Mirror(info.lpSurface, width, entry.ti.maskS+scaleShift, width*2, width*2, height, S_FLAG, 4 );
- }
-
- if (mirrory == 2)
- {
-- //printf("Mirror: ToCreate: (%d,%d) ToLoad: (%d,%d) Scale: (%i,%i) Mirror: (%i,%i) Size: (%i,%i) Mask: %i\n", entry.ti.WidthToCreate, entry.ti.HeightToCreate, entry.ti.WidthToLoad, entry.ti.HeightToLoad, scalex, scaley, mirrorx, mirrory, width, height, entry.ti.maskT+scaleShift);
-+ //printf("Mirror: ToCreate: (%d,%d) ToLoad: (%d,%d) Scale: (%i,%i) Mirror: (%i,%i) Size: (%i,%i) Mask: %i\n", entry.ti.WidthToCreate, entry.ti.HeightToCreate, entry.ti.WidthToLoad, entry.ti.HeightToLoad, scale, scale, mirrorx, mirrory, width, height, entry.ti.maskT+scaleShift);
- gTextureManager.Mirror(info.lpSurface, height, entry.ti.maskT+scaleShift, height*2, entry.pEnhancedTexture->m_dwCreatedTextureWidth, height, T_FLAG, 4 );
- }
-
-- if( entry.ti.WidthToCreate*scalex*mirrorx < entry.pEnhancedTexture->m_dwCreatedTextureWidth )
-+ if( entry.ti.WidthToCreate*scale < entry.pEnhancedTexture->m_dwCreatedTextureWidth )
- {
- // Clamp
- gTextureManager.Clamp(info.lpSurface, width, entry.pEnhancedTexture->m_dwCreatedTextureWidth, entry.pEnhancedTexture->m_dwCreatedTextureWidth, height, S_FLAG, 4 );
- }
-- if( entry.ti.HeightToCreate*scaley*mirrory < entry.pEnhancedTexture->m_dwCreatedTextureHeight )
-+ if( entry.ti.HeightToCreate*scale < entry.pEnhancedTexture->m_dwCreatedTextureHeight )
- {
- // Clamp
- gTextureManager.Clamp(info.lpSurface, height, entry.pEnhancedTexture->m_dwCreatedTextureHeight, entry.pEnhancedTexture->m_dwCreatedTextureWidth, height, T_FLAG, 4 );
diff --git a/debian/patches/infinit_loop.patch b/debian/patches/infinit_loop.patch
deleted file mode 100644
index f1ffc4a..0000000
--- a/debian/patches/infinit_loop.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Description: Fix double infinit loop in GetValidTmemInfoIndex
-Origin: upstream, https://bitbucket.org/richard42/mupen64plus-video-rice/changeset/8b1014486691
-Author: Sven Eckelmann <sven at narfation.org>
-
----
-diff --git a/src/RDP_Texture.h b/src/RDP_Texture.h
-index b2a8fee02214668a59c793d0c162a061d6162f6a..d26d729365ba7c68e5200b33bf6e0d27078fc06d 100644
---- a/src/RDP_Texture.h
-+++ b/src/RDP_Texture.h
-@@ -2163,12 +2163,14 @@ uint32 GetValidTmemInfoIndex(uint32 tmemAddr)
- return tmemAddr;
- else
- {
-- for( uint32 i=index; i>=0; i-- )
-+ for( uint32 x=index+1; x != 0; x-- )
- {
-+ uint32 i = x - 1;
- if( g_TmemFlag[i] != 0 )
- {
-- for( uint32 j=0x1F; j>=0; j-- )
-+ for( uint32 y=0x20; y != 0; y-- )
- {
-+ uint32 j = y - 1;
- if( (g_TmemFlag[i] & (1<<j)) != 0 )
- {
- return ((i<<5)+j);
diff --git a/debian/patches/mipmapping.patch b/debian/patches/mipmapping.patch
deleted file mode 100644
index 79e615a..0000000
--- a/debian/patches/mipmapping.patch
+++ /dev/null
@@ -1,139 +0,0 @@
-Description: Synchronize MipMapping options in Arachnoid and Rice
-Origin: upstream, https://bitbucket.org/richard42/mupen64plus-video-rice/changeset/2d33cae8a164
-Author: Sven Eckelmann <sven at narfation.org>
-
----
-diff --git a/src/Config.cpp b/src/Config.cpp
-index 248b955d575bc358dbd6b6d2768cfae7e80e8441..f6d1564ad9e081c5c0772424b368283d3570732e 100644
---- a/src/Config.cpp
-+++ b/src/Config.cpp
-@@ -341,11 +341,10 @@ BOOL InitConfiguration(void)
- ConfigSetDefaultBool(l_ConfigVideoRice, "LoadHiResTextures", FALSE, "Enable hi-resolution texture file loading");
- ConfigSetDefaultBool(l_ConfigVideoRice, "DumpTexturesToFiles", FALSE, "Enable texture dumping");
- ConfigSetDefaultBool(l_ConfigVideoRice, "ShowFPS", FALSE, "Display On-screen FPS");
-- ConfigSetDefaultBool(l_ConfigVideoRice, "EnableMipmaping", TRUE, "Enable/Disable Mipmaping");
-
-+ ConfigSetDefaultInt(l_ConfigVideoRice, "Mipmapping", 2, "Use Mipmapping? 0=no, 1=nearest, 2=bilinear, 3=trilinear");
- ConfigSetDefaultInt(l_ConfigVideoRice, "FogMethod", 0, "Enable, Disable or Force fog generation (0=Disable, 1=Enable n64 choose, 2=Force Fog)");
- ConfigSetDefaultInt(l_ConfigVideoRice, "ForceTextureFilter", 0, "Force to use texture filtering or not (0=auto: n64 choose, 1=force no filtering, 2=force filtering)");
-- ConfigSetDefaultInt(l_ConfigVideoRice, "TextureFilteringMethod", 1, "Choose wich texture filtering method will be used by your graphic card(0=no filtering, 1=bilinear, 2=trilinear)");
- ConfigSetDefaultInt(l_ConfigVideoRice, "TextureEnhancement", 0, "Primary texture enhancement filter (0=None, 1=2X, 2=2XSAI, 3=HQ2X, 4=LQ2X, 5=HQ4X, 6=Sharpen, 7=Sharpen More, 8=External, 9=Mirrored)");
- ConfigSetDefaultInt(l_ConfigVideoRice, "TextureEnhancementControl", 0, "Secondary texture enhancement filter (0 = none, 1-4 = filtered)");
- ConfigSetDefaultInt(l_ConfigVideoRice, "TextureQuality", TXT_QUALITY_DEFAULT, "Color bit depth to use for textures (0=default, 1=32 bits, 2=16 bits)");
-@@ -353,7 +352,7 @@ BOOL InitConfiguration(void)
- ConfigSetDefaultInt(l_ConfigVideoRice, "MultiSampling", 0, "Enable/Disable MultiSampling (0=off, 2,4,8,16=quality)");
- ConfigSetDefaultInt(l_ConfigVideoRice, "ColorQuality", TEXTURE_FMT_A8R8G8B8, "Color bit depth for rendering window (0=32 bits, 1=16 bits)");
- ConfigSetDefaultInt(l_ConfigVideoRice, "OpenGLRenderSetting", OGL_DEVICE, "OpenGL level to support (0=auto, 1=OGL_1.1, 2=OGL_1.2, 3=OGL_1.3, 4=OGL_1.4, 5=OGL_1.4_V2, 6=OGL_TNT2, 7=NVIDIA_OGL, 8=OGL_FRAGMENT_PROGRAM)");
-- ConfigSetDefaultInt(l_ConfigVideoRice, "AnisotropicFiltering", 0, "Enable/Disable Anisotropic Filtering for Mipmaping (0=no filtering, 2-16=quality). This is uneffective if EnableMipmaping is false. If the given value is to high to be supported by your graphic card, the value will be the highest value your graphic card can support. Better result with Trilinear filtering");
-+ ConfigSetDefaultInt(l_ConfigVideoRice, "AnisotropicFiltering", 0, "Enable/Disable Anisotropic Filtering for Mipmapping (0=no filtering, 2-16=quality). This is uneffective if Mipmapping is 0. If the given value is to high to be supported by your graphic card, the value will be the highest value your graphic card can support. Better result with Trilinear filtering");
- return TRUE;
- }
-
-@@ -453,11 +452,10 @@ static void ReadConfiguration(void)
- options.bLoadHiResTextures = ConfigGetParamBool(l_ConfigVideoRice, "LoadHiResTextures");
- options.bDumpTexturesToFiles = ConfigGetParamBool(l_ConfigVideoRice, "DumpTexturesToFiles");
- options.bShowFPS = ConfigGetParamBool(l_ConfigVideoRice, "ShowFPS");
-- options.bEnableMipmaping = ConfigGetParamBool(l_ConfigVideoRice, "EnableMipmaping");
-
-+ options.mipmapping = ConfigGetParamInt(l_ConfigVideoRice, "Mipmapping");
- options.fogMethod = ConfigGetParamInt(l_ConfigVideoRice, "FogMethod");
- options.forceTextureFilter = ConfigGetParamInt(l_ConfigVideoRice, "ForceTextureFilter");
-- options.textureFilteringMethod = ConfigGetParamInt(l_ConfigVideoRice, "TextureFilteringMethod");
- options.textureEnhancement = ConfigGetParamInt(l_ConfigVideoRice, "TextureEnhancement");
- options.textureEnhancementControl = ConfigGetParamInt(l_ConfigVideoRice, "TextureEnhancementControl");
- options.textureQuality = ConfigGetParamInt(l_ConfigVideoRice, "TextureQuality");
-diff --git a/src/Config.h b/src/Config.h
-index bd9bab2002804b57fff5aee35fb2c42a93231665..c3b74f5ecc90dd4505711f1e8a3d3470aa7cea44 100644
---- a/src/Config.h
-+++ b/src/Config.h
-@@ -105,6 +105,7 @@ enum {
- };
-
- enum {
-+ TEXTURE_NO_MIPMAP = 0,
- TEXTURE_NO_FILTER,
- TEXTURE_BILINEAR_FILTER,
- TEXTURE_TRILINEAR_FILTER,
-@@ -210,11 +211,10 @@ typedef struct {
- BOOL bUseFullTMEM;
-
- BOOL bShowFPS;
-- BOOL bEnableMipmaping;
-
-+ uint32 mipmapping;
- uint32 fogMethod;
- uint32 forceTextureFilter;
-- uint32 textureFilteringMethod;
- uint32 textureEnhancement;
- uint32 textureEnhancementControl;
- uint32 textureQuality;
-diff --git a/src/OGLExtRender.cpp b/src/OGLExtRender.cpp
-index c58a61da3f98662115f7fcf8910250d2e1ba4a5c..5eb92052c504b81e12345a30745be4dd4fdab6cf 100644
---- a/src/OGLExtRender.cpp
-+++ b/src/OGLExtRender.cpp
-@@ -244,25 +244,20 @@ void COGLExtRender::ApplyTextureFilter()
- {
- iMagFilter = GL_LINEAR;
-
-- if(options.bEnableMipmaping)
-- {
-- //Texture filtering method user want
-- switch(options.textureFilteringMethod)
-- {
-- case TEXTURE_BILINEAR_FILTER:
-- iMinFilter = GL_LINEAR_MIPMAP_NEAREST;
-- break;
-- case TEXTURE_TRILINEAR_FILTER:
-- iMinFilter = GL_LINEAR_MIPMAP_LINEAR;
-- break;
-- case TEXTURE_NO_FILTER:
-- default:
-- iMinFilter = GL_NEAREST_MIPMAP_NEAREST;
-- break;
-- }
-- }
-- else
-+ //Texture filtering method user want
-+ switch(options.mipmapping)
- {
-+ case TEXTURE_BILINEAR_FILTER:
-+ iMinFilter = GL_LINEAR_MIPMAP_NEAREST;
-+ break;
-+ case TEXTURE_TRILINEAR_FILTER:
-+ iMinFilter = GL_LINEAR_MIPMAP_LINEAR;
-+ break;
-+ case TEXTURE_NO_FILTER:
-+ iMinFilter = GL_NEAREST_MIPMAP_NEAREST;
-+ break;
-+ case TEXTURE_NO_MIPMAP:
-+ default:
- //Bilinear without mipmap
- iMinFilter = GL_LINEAR;
- }
-@@ -271,7 +266,7 @@ void COGLExtRender::ApplyTextureFilter()
- {
- iMagFilter = GL_NEAREST;
-
-- if(options.bEnableMipmaping)
-+ if(options.mipmapping)
- {
- iMinFilter = GL_NEAREST_MIPMAP_NEAREST;
- }
-diff --git a/src/OGLTexture.cpp b/src/OGLTexture.cpp
-index 00e7048610b8a287b1662ec41906045525dcdc35..b8182c6b11753b3ba264fe1726b604c395868c9c 100644
---- a/src/OGLTexture.cpp
-+++ b/src/OGLTexture.cpp
-@@ -104,11 +104,11 @@ void COGLTexture::EndUpdate(DrawInfo *di)
- OPENGL_CHECK_ERRORS;
-
- // mipmap support
-- if(options.bEnableMipmaping)
-+ if(options.mipmapping)
- {
- int m_maximumAnistropy = pcontext->getMaxAnisotropicFiltering(); //if getMaxAnisotropicFiltering() return more than 0, so aniso is supported and maxAnisotropicFiltering is set
-
-- // Set Anisotropic filtering (mipmaping have to be activated, aniso filtering is not effective without)
-+ // Set Anisotropic filtering (mipmapping have to be activated, aniso filtering is not effective without)
- if( m_maximumAnistropy )
- {
- glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAX_ANISOTROPY_EXT, m_maximumAnistropy);
diff --git a/debian/patches/png_truecolor_conversation.patch b/debian/patches/png_truecolor_conversation.patch
deleted file mode 100644
index cdd8bf8..0000000
--- a/debian/patches/png_truecolor_conversation.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-Description: Convert 8-bit png to truecolor when needed
- fix errors when using some texture packs that have PNGs saved in the wrong
- format (8-bit PNG but should be true color)
-Origin: upstream, https://bitbucket.org/richard42/mupen64plus-video-rice/changeset/26cae4093009
-Author: Richard Goedeken <Richard at fascinationsoftware.com>
-
----
-diff --git a/src/TextureFilters.cpp b/src/TextureFilters.cpp
-index 3b728c78c463d4bae8965689189c57fbab5b4c1c..22ae445b3a53079387f418be3f7ca05040c7cfed 100644
---- a/src/TextureFilters.cpp
-+++ b/src/TextureFilters.cpp
-@@ -1565,9 +1565,28 @@ bool LoadRGBBufferFromPNGFile(char *filename, unsigned char **pbuf, int &width,
- pSrc++;
- }
- }
-+ else if (img.bits_per_pixel == 8 && (bits_per_pixel == 24 || bits_per_pixel == 32))
-+ {
-+ // do palette lookup and convert 8bpp to 24/32bpp
-+ int destBytePP = bits_per_pixel / 8;
-+ int paletteBytePP = img.bytes_per_palette_entry;
-+ unsigned char *pSrc = img.bits;
-+ unsigned char *pDst = *pbuf;
-+ // clear the destination image data (just to clear alpha if bpp=32)
-+ memset(*pbuf, 0, img.width*img.height*destBytePP);
-+ for (int i = 0; i < (int)(img.width*img.height); i++)
-+ {
-+ unsigned char clridx = *pSrc++;
-+ unsigned char *palcolor = img.palette + clridx * paletteBytePP;
-+ pDst[0] = palcolor[2]; // red
-+ pDst[1] = palcolor[1]; // green
-+ pDst[2] = palcolor[0]; // blue
-+ pDst += destBytePP;
-+ }
-+ }
- else
- {
-- DebugMessage(M64MSG_ERROR, "PNG file is %i bpp but texture is %i bpp.", img.bits_per_pixel, bits_per_pixel);
-+ DebugMessage(M64MSG_ERROR, "PNG file '%s' is %i bpp but texture is %i bpp.", filename, img.bits_per_pixel, bits_per_pixel);
- delete [] *pbuf;
- *pbuf = NULL;
- }
-@@ -1580,7 +1599,7 @@ bool LoadRGBBufferFromPNGFile(char *filename, unsigned char **pbuf, int &width,
- }
- else
- {
-- DebugMessage(M64MSG_ERROR, "ReadPNG() returned error in LoadRGBBufferFromPNGFile!");
-+ DebugMessage(M64MSG_ERROR, "ReadPNG() returned error for '%s' in LoadRGBBufferFromPNGFile!", filename);
- *pbuf = NULL;
- return false;
- }
diff --git a/debian/patches/portable_movsxl.patch b/debian/patches/portable_movsxl.patch
deleted file mode 100644
index 2a39388..0000000
--- a/debian/patches/portable_movsxl.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-Description: Replace movsxl with more portable mnemonic movslq
-Origin: upstream, https://bitbucket.org/richard42/mupen64plus-video-rice/changeset/e22b417ae26e
-Author: Sven Eckelmann <sven at narfation.org>
-
----
-diff --git a/src/FrameBuffer.cpp b/src/FrameBuffer.cpp
-index 9d4cff06664e22e61561cbbe8753ac175863c7a3..103025c856b1cbd8364671d27e14e9e4507ca103 100644
---- a/src/FrameBuffer.cpp
-+++ b/src/FrameBuffer.cpp
-@@ -653,9 +653,9 @@ l1: mov esi, [ecx+ebx]
- }
- #elif defined(__GNUC__) && defined(__x86_64__) && !defined(NO_ASM)
- asm volatile(" xorl %k2, %k2 \n"
-- " movsxl %k4, %q4 \n"
-+ " movslq %k4, %q4 \n"
- "0: \n"
-- " movsxl %3, %%rbx \n"
-+ " movslq %3, %%rbx \n"
- " sub $4, %%rbx \n"
- "1: \n"
- " movl (%0,%%rbx,1), %%eax \n"
-diff --git a/src/RenderBase.cpp b/src/RenderBase.cpp
-index 51f2ff692989575e711b1e8a5742b6eee9a779d5..ef1d8c03435fafc2b54180ebaa3094f6c4c36a78 100644
---- a/src/RenderBase.cpp
-+++ b/src/RenderBase.cpp
-@@ -384,7 +384,7 @@ __declspec( naked ) void __fastcall SSEVec3TransformDKR(XVECTOR4 &pOut, const X
- void SSEVec3Transform(int i)
- {
- asm volatile(" shl $4, %0 \n"
-- " movsxl %k0, %q0 \n"
-+ " movslq %k0, %q0 \n"
- " movaps (%1,%q0), %%xmm1 \n"
- " movaps 0(%2), %%xmm4 \n"
- " movaps 16(%2), %%xmm5 \n"
diff --git a/debian/patches/rewrite_makefile.patch b/debian/patches/rewrite_makefile.patch
deleted file mode 100644
index 8667c87..0000000
--- a/debian/patches/rewrite_makefile.patch
+++ /dev/null
@@ -1,294 +0,0 @@
-Description: Rewrite Makefile to fix flags and linking
-Author: Sven Eckelmann <sven at narfation.org>
-
----
-diff --git a/projects/unix/Makefile b/projects/unix/Makefile
-index cc275e6f2dd4a02ef3a404789bf7cf56cbfc10c7..784dd54ea26fa0997600aa4b23bec59ec440f3f9 100644
---- a/projects/unix/Makefile
-+++ b/projects/unix/Makefile
-@@ -49,6 +49,12 @@ ifeq ("$(UNAME)","FreeBSD")
- SO_EXTENSION = so
- SHARED = -shared
- endif
-+ifeq ("$(UNAME)","OpenBSD")
-+ OS = FREEBSD
-+ SO_EXTENSION = so
-+ SHARED = -shared
-+ $(warning OS type "$(UNAME)" not officially supported.')
-+endif
- ifneq ("$(filter GNU/kFreeBSD kfreebsd,$(UNAME))","")
- OS = LINUX
- SO_EXTENSION = so
-@@ -88,74 +94,81 @@ ifeq ("$(CPU)","NONE")
- $(error CPU type "$(HOST_CPU)" not supported. Please file bug report at 'http://code.google.com/p/mupen64plus/issues')
- endif
-
--# base CFLAGS, LIBS, and LDFLAGS
--CFLAGS += -Wall -ffast-math -funroll-loops -fexpensive-optimizations -fno-strict-aliasing -fvisibility=hidden -I../../src
-+# base CFLAGS, LDLIBS, and LDFLAGS
-+OPTFLAGS ?= -O3
-+CFLAGS += $(OPTFLAGS) -Wall -msse -ffast-math -fno-strict-aliasing -fvisibility=hidden -I../../src
- CXXFLAGS += -fvisibility-inlines-hidden
--LDFLAGS += -lpng
-+LDFLAGS += $(SHARED)
-
- # Since we are building a shared library, we must compile with -fPIC for x86_64 CPUs.
- # On 32-bit systems we do not want to use -fPIC because we don't have to and it has a big performance penalty on this arch
- ifeq ($(ARCH_DETECTED), 64BITS)
-- CFLAGS += -fpic -DPIC
-+ PIC ?= 1
- endif
-+ifeq ($(PIC), 1)
-+ CFLAGS += -fPIC
-+ LDFLAGS += -fPIC
-+endif
-+
- # tweak flags for 32-bit build on 64-bit system
- ifeq ($(ARCH_DETECTED), 64BITS_32)
- ifeq ($(OS), FREEBSD)
- $(error Do not use the BITS=32 option with FreeBSD, use -m32 and -m elf_i386)
- endif
- CFLAGS += -m32
-- LDFLAGS += -m32 -m elf_i386
-+ LDFLAGS += -m32 -Wl,-m,elf_i386
- endif
-
- # set special flags per-system
--ifeq ($(OS),FREEBSD)
-- LDFLAGS += -lGL $(shell pkg-config --libs libpng)
-- CFLAGS += $(shell pkg-config --cflags libpng)
--endif
- ifeq ($(OS), LINUX)
-- LDFLAGS += -ldl -lGL
-+ LDLIBS += -ldl
- # only export api symbols
- LDFLAGS += -Wl,-version-script,$(SRCDIR)/video_api_export.ver
-- ifeq ($(CPU), X86)
-- ifeq ($(ARCH_DETECTED), 64BITS)
-- CFLAGS += -pipe -O3 -march=athlon64
-- else
-- CFLAGS += -pipe -O3 -mmmx -msse -march=i686 -mtune=pentium-m -fomit-frame-pointer
-- endif
-- endif
- endif
- ifeq ($(OS), OSX)
- ifeq ($(CPU), X86)
- ifeq ($(ARCH_DETECTED), 64BITS)
- CFLAGS += -pipe -O3 -arch x86_64 -mmacosx-version-min=10.5 -isysroot /Developer/SDKs/MacOSX10.5.sdk
-- LDFLAGS += -ldl -bundle -framework OpenGL -arch x86_64
-+ LDFLAGS += -bundle -framework OpenGL -arch x86_64
-+ LDLIBS += -ldl
- else
- CFLAGS += -pipe -O3 -mmmx -msse -fomit-frame-pointer -arch i686 -mmacosx-version-min=10.5 -isysroot /Developer/SDKs/MacOSX10.5.sdk
-- LDFLAGS += -ldl -bundle -framework OpenGL -arch i686
-+ LDFLAGS += -bundle -framework OpenGL -arch i686
-+ LDLIBS += -ldl
- endif
- endif
- endif
--ifeq ($(CPU), PPC)
-- CFLAGS += -mcpu=powerpc
-+
-+# test for essential build dependencies
-+ifeq ($(shell which pkg-config 2>/dev/null),)
-+ $(error pkg-config not found)
- endif
-+ifeq ($(shell pkg-config --modversion gl 2>/dev/null),)
-+ $(error No OpenGL development libraries found!)
-+endif
-+ifeq ($(shell pkg-config --modversion libpng 2>/dev/null),)
-+ $(error No libpng development libraries found!)
-+endif
-+CFLAGS += $(shell pkg-config --cflags gl libpng)
-+LDLIBS += $(shell pkg-config --libs gl libpng)
-
- # test for presence of SDL
- ifeq ($(shell which sdl-config 2>/dev/null),)
- $(error No SDL development libraries found!)
- endif
- ifeq ($(OS),FREEBSD)
-- CFLAGS += $(shell sdl-config --cflags) -DPIC
-- LDFLAGS += $(shell sdl-config --libs) -DPIC
-+ CFLAGS += $(shell sdl-config --cflags)
-+ LDLIBS += $(shell sdl-config --libs)
- endif
- ifeq ($(OS),OSX)
-- CFLAGS += $(shell sdl-config --cflags) -DPIC
-+ CFLAGS += $(shell sdl-config --cflags)
- # sdl-config on mac screws up when we're trying to build a library and not an executable
- # SDL 1.3 is supposed to fix that, if it's ever released
-- LDFLAGS += -L/usr/local/lib -lSDL -Wl,-framework,Cocoa
-+ LDLIBS += -L/usr/local/lib -lSDL -Wl,-framework,Cocoa
- endif
- ifeq ($(OS),LINUX)
- CFLAGS += $(shell sdl-config --cflags)
-- LDFLAGS += $(shell sdl-config --libs)
-+ LDLIBS += $(shell sdl-config --libs)
- endif
-
- # set mupen64plus core API header path
-@@ -180,20 +193,31 @@ else
- endif
- endif
-
--# set shell function names
--CC ?= gcc
--CXX ?= g++
--INSTALL ?= install
--ifeq ($(OS),OSX)
-- STRIP ?= strip -x
--else
-- STRIP ?= strip -s
-+# reduced compile output when running make without V=1
-+ifneq ($(findstring $(MAKEFLAGS),s),s)
-+ifndef V
-+ Q_CC = @echo ' CC '$@;
-+ Q_CXX = @echo ' CXX '$@;
-+ Q_LD = @echo ' LD '$@;
- endif
-+endif
-+
-+# set base program pointers and flags
-+CC ?= gcc
-+CXX ?= g++
-+RM ?= rm -f
-+INSTALL ?= install
-+MKDIR ?= mkdir -p
-+COMPILE.c = $(Q_CC)$(CC) $(CFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -c
-+COMPILE.cc = $(Q_CXX)$(CXX) $(CXXFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -c
-+LINK.o = $(Q_LD)$(CXX) $(LDFLAGS) $(TARGET_ARCH)
-
- # set special flags for given Makefile parameters
- ifeq ($(DEBUG),1)
- CFLAGS += -g
-- STRIP = true # disable binary strip
-+ INSTALL_STRIP_FLAG ?=
-+else
-+ INSTALL_STRIP_FLAG ?= -s
- endif
- ifeq ($(NO_ASM), 1)
- CFLAGS += -DNO_ASM
-@@ -207,7 +231,10 @@ ifeq ($(SHAREDIR),)
- SHAREDIR := $(PREFIX)/share/mupen64plus
- endif
- ifeq ($(LIBDIR),)
-- LIBDIR := $(PREFIX)/lib/mupen64plus
-+ LIBDIR := $(PREFIX)/lib
-+endif
-+ifeq ($(PLUGINDIR),)
-+ PLUGINDIR := $(LIBDIR)/mupen64plus
- endif
-
- SRCDIR = ../../src
-@@ -266,7 +293,7 @@ SOURCE = \
- OBJECTS := $(patsubst $(SRCDIR)/%.c, $(OBJDIR)/%.o, $(filter %.c, $(SOURCE)))
- OBJECTS += $(patsubst $(SRCDIR)/%.cpp, $(OBJDIR)/%.o, $(filter %.cpp, $(SOURCE)))
- OBJDIRS = $(dir $(OBJECTS))
--$(shell mkdir -p $(OBJDIRS))
-+$(shell $(MKDIR) $(OBJDIRS))
-
- # build targets
- TARGET = mupen64plus-video-rice.$(SO_EXTENSION)
-@@ -283,29 +310,32 @@ targets:
- @echo " BITS=32 == build 32-bit binaries on 64-bit machine"
- @echo " NO_ASM=1 == build without inline assembly code (x86 MMX/SSE)"
- @echo " APIDIR=path == path to find Mupen64Plus Core headers"
-+ @echo " OPTFLAGS=flag == compiler optimization (default: -O3)"
-+ @echo " PIC=(1|0) == Force enable/disable of position independent code"
- @echo " Install Options:"
- @echo " PREFIX=path == install/uninstall prefix (default: /usr/local)"
- @echo " SHAREDIR=path == path to install shared data files (default: PREFIX/share/mupen64plus)"
-- @echo " LIBDIR=path == path to install plugin libraries (default: PREFIX/lib/mupen64plus)"
-+ @echo " LIBDIR=path == library prefix (default: PREFIX/lib)"
-+ @echo " PLUGINDIR=path == path to install plugin libraries (default: LIBDIR/mupen64plus)"
- @echo " DESTDIR=path == path to prepend to all installation paths (only for packagers)"
- @echo " Debugging Options:"
- @echo " DEBUG=1 == add debugging symbols"
-+ @echo " V=1 == show verbose compiler output"
-
- all: $(TARGET)
-
- install: $(TARGET)
-- $(INSTALL) -d -v "$(DESTDIR)$(LIBDIR)"
-- $(INSTALL) -m 0644 $(TARGET) "$(DESTDIR)$(LIBDIR)"
-- $(INSTALL) -d -v "$(DESTDIR)$(SHAREDIR)"
-+ $(INSTALL) -d "$(DESTDIR)$(PLUGINDIR)"
-+ $(INSTALL) -m 0644 $(INSTALL_STRIP_FLAG) $(TARGET) "$(DESTDIR)$(PLUGINDIR)"
-+ $(INSTALL) -d "$(DESTDIR)$(SHAREDIR)"
- $(INSTALL) -m 0644 "../../data/RiceVideoLinux.ini" "$(DESTDIR)$(SHAREDIR)"
-
- uninstall:
-- rm -f "$(DESTDIR)$(LIBDIR)/$(TARGET)"
-- rm -f "$(DESTDIR)$(SHAREDIR)/RiceVideoLinux.ini"
-+ $(RM) "$(DESTDIR)$(PLUGINDIR)/$(TARGET)"
-+ $(RM) "$(DESTDIR)$(SHAREDIR)/RiceVideoLinux.ini"
-
- clean:
-- rm -rf ./_obj/* $(TARGET)
-- rmdir ./_obj
-+ $(RM) -r ./_obj $(TARGET)
-
- rebuild: clean all
-
-@@ -315,22 +345,14 @@ CFLAGS += -MD
-
- CXXFLAGS += $(CFLAGS)
-
--# reduced compile output when running make without V=1
--ifneq ($(findstring $(MAKEFLAGS),s),s)
--ifndef V
-- Q_CC = @echo ' CC '$@;
-- Q_CXX = @echo ' CXX '$@;
-- Q_LD = @echo ' LD '$@;
--endif
--endif
--
--# build rules
--$(TARGET): $(OBJECTS)
-- $(Q_LD)$(CXX) $(SHARED) $^ $(LDFLAGS) -o $@
-- $(STRIP) $@
--
-+# standard build rules
- $(OBJDIR)/%.o: $(SRCDIR)/%.c
-- $(Q_CC)$(CC) -o $@ $(CFLAGS) -c $<
-+ $(COMPILE.c) -o $@ $<
-
- $(OBJDIR)/%.o: $(SRCDIR)/%.cpp
-- $(Q_CXX)$(CXX) -o $@ $(CXXFLAGS) -c $<
-+ $(COMPILE.cc) -o $@ $<
-+
-+$(TARGET): $(OBJECTS)
-+ $(LINK.o) $^ $(LOADLIBES) $(LDLIBS) -o $@
-+
-+.PHONY: all clean install uninstall targets
-diff --git a/src/FrameBuffer.cpp b/src/FrameBuffer.cpp
-index 5b3f52eb66c5a34aa146a624d2b80f209c3fc29b..9d4cff06664e22e61561cbbe8753ac175863c7a3 100644
---- a/src/FrameBuffer.cpp
-+++ b/src/FrameBuffer.cpp
-@@ -674,7 +674,7 @@ l1: mov esi, [ecx+ebx]
- : "%rbx", "%rax", "memory", "cc"
- );
- #elif !defined(NO_ASM)
--# ifndef PIC
-+# if !defined(__PIC__)
- asm volatile("pusha \n"
- "mov pAsmStart, %%ecx \n" // = pStart
- "mov $0, %%edx \n" // The CRC
-@@ -701,7 +701,7 @@ l1: mov esi, [ecx+ebx]
- :
- : "memory", "cc"
- );
--# else // PIC
-+# else // defined(__PIC__)
- unsigned int saveEBX;
- unsigned int saveEAX;
- unsigned int saveECX;
-@@ -747,7 +747,7 @@ l1: mov esi, [ecx+ebx]
- : "memory", "cc"
- );
- dwAsmCRC = asmCRC;
--# endif // PIC
-+# endif // defined(__PIC__)
- #endif
- }
- catch(...)
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 3411a11..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,10 +0,0 @@
-rewrite_makefile.patch
-highres_memcorruption.patch
-png_truecolor_conversation.patch
-divide_by_zero.patch
-undefined_functions.patch
-portable_movsxl.patch
-infinit_loop.patch
-wom_corruption.patch
-z_coordinate_lines.patch
-mipmapping.patch
diff --git a/debian/patches/undefined_functions.patch b/debian/patches/undefined_functions.patch
deleted file mode 100644
index 2b5c77a..0000000
--- a/debian/patches/undefined_functions.patch
+++ /dev/null
@@ -1,117 +0,0 @@
-Description: Add header for undefined min/max/memcpy
-Origin: upstream, Add header for undefined min/max/memcpy
-Author: Sven Eckelmann <sven at narfation.org>
-
----
-diff --git a/src/CSortedList.h b/src/CSortedList.h
-index 25d97e20bab075d6598b1a6c5bb6f560da12d9e7..91fa9fa3a99835c4658f123f8a3f60159969588b 100644
---- a/src/CSortedList.h
-+++ b/src/CSortedList.h
-@@ -19,6 +19,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- #ifndef _SORTED_LIST_H_
- #define _SORTED_LIST_H_
-
-+#include <cstring>
-+
- template<class Key, class Element>
- class CSortedList
- {
-@@ -72,8 +74,8 @@ public:
-
- keys = new Key[maxSize];
- elements = new Element[maxSize];
-- memcpy(keys,oldkeys,oldmaxsize*sizeof(Key));
-- memcpy(elements,oldelements,oldmaxsize*sizeof(Element));
-+ std::memcpy(keys,oldkeys,oldmaxsize*sizeof(Key));
-+ std::memcpy(elements,oldelements,oldmaxsize*sizeof(Element));
- }
-
- for( i=0; i<curSize; i++ )
-diff --git a/src/DirectXDecodedMux.cpp b/src/DirectXDecodedMux.cpp
-index a320a6005443092f0bd9717736969606a8acf8d3..7ba0d29ac0a37c26f1cce42fb44dd40e4227e663 100644
---- a/src/DirectXDecodedMux.cpp
-+++ b/src/DirectXDecodedMux.cpp
-@@ -18,6 +18,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
- #include "Combiner.h"
- #include "DirectXDecodedMux.h"
-+#include <algorithm>
-
- //This function is called after Reformat to handel two texels in 1 cycle, D3D can not handle
- //two texels in a single stage, the texels must be splited into multiple stages
-@@ -158,7 +159,7 @@ void CDirectXDecodedMux::Reformat(bool do_complement)
- {
- DecodedMux::Reformat(do_complement);
- ReformatAgainWithTwoTexels();
-- mType = max(max(max(splitType[0], splitType[1]),splitType[2]),splitType[3]);
-+ mType = std::max(std::max(std::max(splitType[0], splitType[1]),splitType[2]),splitType[3]);
- }
-
-
-diff --git a/src/Render.cpp b/src/Render.cpp
-index 07164aab58c88907cffaf1228c6b411a768b3bac..f044ec950e29bfbad79d729ea438537de7ad4127 100644
---- a/src/Render.cpp
-+++ b/src/Render.cpp
-@@ -27,6 +27,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
- #include "liblinux/BMGLibPNG.h"
-
-+#include <algorithm>
-+
- extern FiddledVtx * g_pVtxBase;
- CRender * CRender::g_pRender=NULL;
- int CRender::gRenderReferenceCount=0;
-@@ -1841,15 +1843,15 @@ void CRender::UpdateClipRectangle()
-
- void CRender::UpdateScissorWithClipRatio()
- {
-- gRSP.real_clip_scissor_left = max(gRDP.scissor.left, gRSP.clip_ratio_left);
-- gRSP.real_clip_scissor_top = max(gRDP.scissor.top, gRSP.clip_ratio_top);
-- gRSP.real_clip_scissor_right = min(gRDP.scissor.right,gRSP.clip_ratio_right);
-- gRSP.real_clip_scissor_bottom = min(gRDP.scissor.bottom, gRSP.clip_ratio_bottom);
-+ gRSP.real_clip_scissor_left = std::max(gRDP.scissor.left, gRSP.clip_ratio_left);
-+ gRSP.real_clip_scissor_top = std::max(gRDP.scissor.top, gRSP.clip_ratio_top);
-+ gRSP.real_clip_scissor_right = std::min(gRDP.scissor.right,gRSP.clip_ratio_right);
-+ gRSP.real_clip_scissor_bottom = std::min(gRDP.scissor.bottom, gRSP.clip_ratio_bottom);
-
-- gRSP.real_clip_scissor_left = max(gRSP.real_clip_scissor_left, 0);
-- gRSP.real_clip_scissor_top = max(gRSP.real_clip_scissor_top, 0);
-- gRSP.real_clip_scissor_right = min(gRSP.real_clip_scissor_right,windowSetting.uViWidth-1);
-- gRSP.real_clip_scissor_bottom = min(gRSP.real_clip_scissor_bottom, windowSetting.uViHeight-1);
-+ gRSP.real_clip_scissor_left = std::max(gRSP.real_clip_scissor_left, 0);
-+ gRSP.real_clip_scissor_top = std::max(gRSP.real_clip_scissor_top, 0);
-+ gRSP.real_clip_scissor_right = std::min(gRSP.real_clip_scissor_right,windowSetting.uViWidth-1);
-+ gRSP.real_clip_scissor_bottom = std::min(gRSP.real_clip_scissor_bottom, windowSetting.uViHeight-1);
-
- WindowSettingStruct &w = windowSetting;
- w.clipping.left = (uint32)(gRSP.real_clip_scissor_left*windowSetting.fMultX);
-diff --git a/src/TextureFilters.cpp b/src/TextureFilters.cpp
-index 9641e1746deab2ee81c0f113915ee32dc192d905..869adfc97d0c968e38d4c0084c1476388f4de87d 100644
---- a/src/TextureFilters.cpp
-+++ b/src/TextureFilters.cpp
-@@ -30,6 +30,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- #include "liblinux/BMGLibPNG.h"
- #include "liblinux/BMGDLL.h"
- #include <sys/types.h>
-+#include <algorithm>
-
- /************************************************************************/
- /* 2X filters */
-@@ -308,7 +309,7 @@ void SharpenFilter_32(uint32 *pdata, uint32 width, uint32 height, uint32 pitch,
- val[z]=t5;
- if( (t5*mul2) > (t1+t3+t7+t9+t2+t4+t6+t8)*mul1 )
- {
-- val[z]= min((((t5*mul3) - (t1+t3+t7+t9+t2+t4+t6+t8)*mul1)>>shift4),0xFF);
-+ val[z]= std::min((((t5*mul3) - (t1+t3+t7+t9+t2+t4+t6+t8)*mul1)>>shift4),0xFFU);
- }
- }
- dest[x] = val[0]|(val[1]<<8)|(val[2]<<16)|(val[3]<<24);
-@@ -375,7 +376,7 @@ void SharpenFilter_16(uint16 *pdata, uint32 width, uint32 height, uint32 pitch,
- if( (t5*mul2) > (t1+t3+t7+t9+t2+t4+t6+t8)*mul1 )
- {
- val[z] = (((t5*mul3) - (t1+t3+t7+t9+t2+t4+t6+t8)*mul1)>>shift4);
-- val[z]= min(val[z],0xF);
-+ val[z]= std::min(val[z],(unsigned short)0xFU);
- }
- }
- dest[x] = val[0]|(val[1]<<4)|(val[2]<<8)|(val[3]<<12);
diff --git a/debian/patches/wom_corruption.patch b/debian/patches/wom_corruption.patch
deleted file mode 100644
index 8ea6e34..0000000
--- a/debian/patches/wom_corruption.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-Description: Remove write-only member variables m_bClampS and m_bClampT
- Write access to m_bClampS and m_bClampT resulted in memory corruption due to
- write access outside of the array bounds. It is never read and thus it can
- savely be removed.
-Origin: upstream, https://bitbucket.org/richard42/mupen64plus-video-rice/changeset/d1f899eef3ee
-Author: Sven Eckelmann <sven at narfation.org>
-
----
-diff --git a/src/OGLExtRender.cpp b/src/OGLExtRender.cpp
-index 7cc1e1cb4c71e56e343cde2b9f5fe9e67d16ee34..c58a61da3f98662115f7fcf8910250d2e1ba4a5c 100644
---- a/src/OGLExtRender.cpp
-+++ b/src/OGLExtRender.cpp
-@@ -170,7 +170,6 @@ void COGLExtRender::SetTextureUFlag(TextureUVFlag dwFlag, uint32 dwTile)
- BindTexture(pTexture->m_dwTextureName, textureNo);
- }
- SetTexWrapS(textureNo, OGLXUVFlagMaps[dwFlag].realFlag);
-- m_bClampS[textureNo] = dwFlag==TEXTURE_UV_FLAG_CLAMP?true:false;
- }
- }
- }
-@@ -212,7 +211,6 @@ void COGLExtRender::SetTextureVFlag(TextureUVFlag dwFlag, uint32 dwTile)
- BindTexture(pTexture->m_dwTextureName, textureNo);
- }
- SetTexWrapT(textureNo, OGLXUVFlagMaps[dwFlag].realFlag);
-- m_bClampT[textureNo] = dwFlag==TEXTURE_UV_FLAG_CLAMP?true:false;
- }
- }
- }
-diff --git a/src/OGLRender.cpp b/src/OGLRender.cpp
-index 7ae7e7d4a0d2ac2d789890180c35fff80472223b..8b883bf7cc73de70c2fe343ae5f90e5c38115ad4 100644
---- a/src/OGLRender.cpp
-+++ b/src/OGLRender.cpp
-@@ -41,8 +41,6 @@ OGLRender::OGLRender()
- m_bSupportFogCoordExt = pcontext->m_bSupportFogCoord;
- m_bMultiTexture = pcontext->m_bSupportMultiTexture;
- m_bSupportClampToEdge = false;
-- m_bClampS[0] = false;
-- m_bClampT[0] = m_bClampT[1] = false;
- for( int i=0; i<8; i++ )
- {
- m_curBoundTex[i]=0;
-@@ -487,7 +485,6 @@ void OGLRender::SetTextureUFlag(TextureUVFlag dwFlag, uint32 dwTile)
- BindTexture(pTexture->m_dwTextureName, 0);
- }
- SetTexWrapS(0, OGLXUVFlagMaps[dwFlag].realFlag);
-- m_bClampS[0] = dwFlag==TEXTURE_UV_FLAG_CLAMP?true:false;
- }
- }
- void OGLRender::SetTextureVFlag(TextureUVFlag dwFlag, uint32 dwTile)
-@@ -502,7 +499,6 @@ void OGLRender::SetTextureVFlag(TextureUVFlag dwFlag, uint32 dwTile)
- BindTexture(pTexture->m_dwTextureName, 0);
- }
- SetTexWrapT(0, OGLXUVFlagMaps[dwFlag].realFlag);
-- m_bClampT[0] = dwFlag==TEXTURE_UV_FLAG_CLAMP?true:false;
- }
- }
-
-diff --git a/src/OGLRender.h b/src/OGLRender.h
-index 750b754b072f0e1dbecf7efba08830b0c0417feb..d5fb387aba5f871dfa0f9d6ed456724e30cd0ea0 100644
---- a/src/OGLRender.h
-+++ b/src/OGLRender.h
-@@ -104,8 +104,6 @@ protected:
- bool m_bSupportFogCoordExt;
- bool m_bMultiTexture;
- bool m_bSupportClampToEdge;
-- bool m_bClampS[2];
-- bool m_bClampT[2];
-
- GLuint m_curBoundTex[8];
- BOOL m_texUnitEnabled[8];
diff --git a/debian/patches/z_coordinate_lines.patch b/debian/patches/z_coordinate_lines.patch
deleted file mode 100644
index 0715564..0000000
--- a/debian/patches/z_coordinate_lines.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Description: Fix z coordinate in 3d line rendering
-Origin: upstream, https://bitbucket.org/richard42/mupen64plus-video-rice/changeset/ceb723921445
-Author: Sven Eckelmann <sven at narfation.org>
-
----
-diff --git a/src/OGLRender.cpp b/src/OGLRender.cpp
-index 8b883bf7cc73de70c2fe343ae5f90e5c38115ad4..1cc7de5eceb581ad820406c6ac7517e02fad36b4 100644
---- a/src/OGLRender.cpp
-+++ b/src/OGLRender.cpp
-@@ -577,8 +577,8 @@ bool OGLRender::RenderLine3D()
- glBegin(GL_TRIANGLE_FAN);
-
- glColor4f(m_line3DVtx[1].r, m_line3DVtx[1].g, m_line3DVtx[1].b, m_line3DVtx[1].a);
-- glVertex3f(m_line3DVector[3].x, m_line3DVector[3].y, -m_line3DVtx[3].z);
-- glVertex3f(m_line3DVector[2].x, m_line3DVector[2].y, -m_line3DVtx[2].z);
-+ glVertex3f(m_line3DVector[3].x, m_line3DVector[3].y, -m_line3DVtx[1].z);
-+ glVertex3f(m_line3DVector[2].x, m_line3DVector[2].y, -m_line3DVtx[0].z);
-
- glColor4ub(m_line3DVtx[0].r, m_line3DVtx[0].g, m_line3DVtx[0].b, m_line3DVtx[0].a);
- glVertex3f(m_line3DVector[1].x, m_line3DVector[1].y, -m_line3DVtx[1].z);
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/mupen64plus-video-rice.git
More information about the Pkg-games-commits
mailing list