This is an automated email from the git hooks/post-receive script.
smcv pushed a commit to annotated tag 1.42d
in repository iortcw.
commit 12d030f1fd53c0441e2d8c3366ffef045a661c02
Author: m4n4t4...@gmail.com
<m4n4t4...@gmail.com@e65d2741-a53d-b2dc-ae96-bb75fa5e4c4a>
Date: Sun Feb 15 16:56:47 2015 +0000
All: Revert some of the OpenGL ES changes
---
MP/code/client/cl_cin.c | 11 -----------
MP/code/renderer/tr_init.c | 5 -----
MP/code/renderer/tr_types.h | 2 --
SP/code/client/cl_cin.c | 11 -----------
SP/code/renderer/tr_init.c | 5 -----
SP/code/renderer/tr_types.h | 2 --
6 files changed, 36 deletions(-)
diff --git a/MP/code/client/cl_cin.c b/MP/code/client/cl_cin.c
index 96fa298..d275b10 100644
--- a/MP/code/client/cl_cin.c
+++ b/MP/code/client/cl_cin.c
@@ -609,18 +609,11 @@ static unsigned short yuv_to_rgb( long y, long u, long v
) {
*
******************************************************************************/
static unsigned int yuv_to_rgb24( long y, long u, long v ) {
-#ifdef USE_OPENGLES
- long a,r,g,b,YY = (long)( ROQ_YY_tab[( y )]);
-#else
long r,g,b,YY = (long)( ROQ_YY_tab[( y )] );
-#endif
r = ( YY + ROQ_VR_tab[v] ) >> 6;
g = ( YY + ROQ_UG_tab[u] + ROQ_VG_tab[v] ) >> 6;
b = ( YY + ROQ_UB_tab[u] ) >> 6;
-#ifdef USE_OPENGLES
- a = 255;
-#endif
if ( r < 0 ) {
r = 0;
@@ -641,11 +634,7 @@ static unsigned int yuv_to_rgb24( long y, long u, long v )
{
b = 255;
}
-#ifdef USE_OPENGLES
- return LittleLong( ( r ) | ( g << 8 ) | ( b << 16 ) | ( 255 << 24 ) | (
a << 24 ) );
-#else
return LittleLong( ( r ) | ( g << 8 ) | ( b << 16 ) | ( 255 << 24 ) );
-#endif
}
/******************************************************************************
diff --git a/MP/code/renderer/tr_init.c b/MP/code/renderer/tr_init.c
index 3583ac5..25ed2bd 100644
--- a/MP/code/renderer/tr_init.c
+++ b/MP/code/renderer/tr_init.c
@@ -1354,13 +1354,8 @@ void R_Init( void ) {
memset( &backEnd, 0, sizeof( backEnd ) );
memset( &tess, 0, sizeof( tess ) );
-#ifdef USE_OPENGLES
- if(sizeof(glconfig_t) != 7248)
- ri.Error( ERR_FATAL, "Mod ABI incompatible: sizeof(glconfig_t)
== %u != 7248", (unsigned int) sizeof(glconfig_t));
-#else
if(sizeof(glconfig_t) != 7268)
ri.Error( ERR_FATAL, "Mod ABI incompatible: sizeof(glconfig_t)
== %u != 7268", (unsigned int) sizeof(glconfig_t));
-#endif
// Swap_Init();
diff --git a/MP/code/renderer/tr_types.h b/MP/code/renderer/tr_types.h
index 54d31c6..7f3a547 100644
--- a/MP/code/renderer/tr_types.h
+++ b/MP/code/renderer/tr_types.h
@@ -298,7 +298,6 @@ typedef struct {
qboolean anisotropicAvailable; //----(SA) added
float maxAnisotropy; //----(SA) added
-#ifndef USE_OPENGLES
// vendor-specific support
// NVidia
qboolean NVFogAvailable; //----(SA) added
@@ -307,7 +306,6 @@ typedef struct {
int ATIMaxTruformTess; // for truform support
int ATINormalMode; // for truform support
int ATIPointMode; // for truform support
-#endif
int vidWidth, vidHeight;
// aspect is the screen's physical width / height, which may be
different
diff --git a/SP/code/client/cl_cin.c b/SP/code/client/cl_cin.c
index 653f1f9..f4a985e 100644
--- a/SP/code/client/cl_cin.c
+++ b/SP/code/client/cl_cin.c
@@ -611,18 +611,11 @@ static unsigned short yuv_to_rgb( long y, long u, long v
) {
*
******************************************************************************/
static unsigned int yuv_to_rgb24( long y, long u, long v ) {
-#ifdef USE_OPENGLES
- long a,r,g,b,YY = (long)( ROQ_YY_tab[( y )]);
-#else
long r,g,b,YY = (long)( ROQ_YY_tab[( y )] );
-#endif
r = ( YY + ROQ_VR_tab[v] ) >> 6;
g = ( YY + ROQ_UG_tab[u] + ROQ_VG_tab[v] ) >> 6;
b = ( YY + ROQ_UB_tab[u] ) >> 6;
-#ifdef USE_OPENGLES
- a = 255;
-#endif
if ( r < 0 ) {
r = 0;
@@ -643,11 +636,7 @@ static unsigned int yuv_to_rgb24( long y, long u, long v )
{
b = 255;
}
-#ifdef USE_OPENGLES
- return LittleLong( ( r ) | ( g << 8 ) | ( b << 16 ) | ( 255 << 24 ) | (
a << 24 ) );
-#else
return LittleLong( ( r ) | ( g << 8 ) | ( b << 16 ) | ( 255 << 24 ) );
-#endif
}
/******************************************************************************
diff --git a/SP/code/renderer/tr_init.c b/SP/code/renderer/tr_init.c
index cdcf4fa..4cb656e 100644
--- a/SP/code/renderer/tr_init.c
+++ b/SP/code/renderer/tr_init.c
@@ -1376,13 +1376,8 @@ void R_Init( void ) {
memset( &backEnd, 0, sizeof( backEnd ) );
memset( &tess, 0, sizeof( tess ) );
-#ifdef USE_OPENGLES
- if(sizeof(glconfig_t) != 7248)
- ri.Error( ERR_FATAL, "Mod ABI incompatible: sizeof(glconfig_t)
== %u != 7248", (unsigned int) sizeof(glconfig_t));
-#else
if(sizeof(glconfig_t) != 7268)
ri.Error( ERR_FATAL, "Mod ABI incompatible: sizeof(glconfig_t)
== %u != 7268", (unsigned int) sizeof(glconfig_t));
-#endif
// Swap_Init();
diff --git a/SP/code/renderer/tr_types.h b/SP/code/renderer/tr_types.h
index 33c5491..66f2d3e 100644
--- a/SP/code/renderer/tr_types.h
+++ b/SP/code/renderer/tr_types.h
@@ -308,7 +308,6 @@ typedef struct {
qboolean anisotropicAvailable; //----(SA) added
float maxAnisotropy; //----(SA) added
-#ifndef USE_OPENGLES
// vendor-specific support
// NVidia
qboolean NVFogAvailable; //----(SA) added
@@ -317,7 +316,6 @@ typedef struct {
int ATIMaxTruformTess; // for truform support
int ATINormalMode; // for truform support
int ATIPointMode; // for truform support
-#endif
int vidWidth, vidHeight;
// aspect is the screen's physical width / height, which may be
different
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-games/iortcw.git
_______________________________________________
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
