[mupen64plus-video-glide64mk2] 26/60: Don't try to reinit txc_dxtn when it was already loaded

[Sven Eckelmann]

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-glide64mk2.

commit 81388317caf8795288afbb2308ffc298b688f32f
Author: Sven Eckelmann <sven at narfation.org>
Date:   Thu Jul 11 07:52:47 2013 +0200

    Don't try to reinit txc_dxtn when it was already loaded
---
 debian/patches/s3tc_removal.patch | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/debian/patches/s3tc_removal.patch b/debian/patches/s3tc_removal.patch
index 3619b98..e4cd0c0 100644
--- a/debian/patches/s3tc_removal.patch
+++ b/debian/patches/s3tc_removal.patch
@@ -328,10 +328,10 @@ index 5dead259147eaeffce28076e92fb2a981ea451ec..69a6b39bc3a951421799a0b7115f325c
  _mesa_upscale_teximage2d (unsigned int inWidth, unsigned int inHeight,
  			  unsigned int outWidth, unsigned int outHeight,
 diff --git a/src/GlideHQ/tc-1.1+/wrapper.c b/src/GlideHQ/tc-1.1+/wrapper.c
-index 0a171ee4fabcc4a26aa64b35f659b2cdb4898011..c51611c35b9b3fd00410a5f801376819d586bf0f 100644
+index 0a171ee4fabcc4a26aa64b35f659b2cdb4898011..d3a78fe73d6809567b58ca680648fb5983a03c49 100644
 --- a/src/GlideHQ/tc-1.1+/wrapper.c
 +++ b/src/GlideHQ/tc-1.1+/wrapper.c
-@@ -21,18 +21,59 @@
+@@ -21,18 +21,62 @@
  
  
  #include <assert.h>
@@ -366,6 +366,9 @@ index 0a171ee4fabcc4a26aa64b35f659b2cdb4898011..c51611c35b9b3fd00410a5f801376819
 +{
 +    m64p_error rval;
 +
++    if (_tx_compress_dxtn)
++        return;
++
 +    rval = osal_dynlib_open(&dxtn_lib_handle, DXTN_LIBNAME);
 +    if (rval != M64ERR_SUCCESS) {
 +        WriteLog(M64MSG_WARNING, "Failed to open %s", DXTN_LIBNAME);
@@ -393,7 +396,7 @@ index 0a171ee4fabcc4a26aa64b35f659b2cdb4898011..c51611c35b9b3fd00410a5f801376819
  TAPI void TAPIENTRY
  fetch_2d_texel_rgb_dxt1 (int texImage_RowStride,
  			 const byte *texImage_Data,
-@@ -73,7 +114,7 @@ fetch_2d_texel_rgba_dxt5 (int texImage_RowStride,
+@@ -73,7 +117,7 @@ fetch_2d_texel_rgba_dxt5 (int texImage_RowStride,
  }
  
  
@@ -402,7 +405,7 @@ index 0a171ee4fabcc4a26aa64b35f659b2cdb4898011..c51611c35b9b3fd00410a5f801376819
  tx_compress_dxtn (int srccomps, int width, int height,
  		  const byte *source, int destformat, byte *dest,
  		  int destRowStride)
-@@ -105,3 +146,38 @@ tx_compress_dxtn (int srccomps, int width, int height,
+@@ -105,3 +149,38 @@ tx_compress_dxtn (int srccomps, int width, int height,
  	    assert(0);
      }
  }

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/mupen64plus-video-glide64mk2.git