ShuriZma
/
project64
mirror of https://github.com/project64/project64.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[Video] Remove some includes glide64.h

This commit is contained in:
zilmar 2017-08-12 14:49:58 +10:00
parent 7c9545cbca
commit 0f77559783
7 changed files with 3 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Source/Project64-video/Renderer/OGLcombiner.cpp
View File

@ -22,7 +22,6 @@
#include <math.h>
#include <stdio.h>
#include <stdlib.h>
#include "glide.h"
#include "glitchmain.h"
#include <Project64-video/trace.h>

1
Source/Project64-video/Renderer/OGLgeometry.cpp
View File

@ -18,7 +18,6 @@
#ifdef _WIN32
#include <windows.h>
#endif // _WIN32
#include "glide.h"
#include "glitchmain.h"
#include <Project64-video/trace.h>

6
Source/Project64-video/Renderer/OGLglitchmain.cpp
View File

@ -835,7 +835,7 @@ bool gfxSstWinClose()
glDeleteTextures(1, &(fbs[i].texid));
glDeleteFramebuffersEXT(1, &(fbs[i].fbid));
glDeleteRenderbuffersEXT(1, &(fbs[i].zbid));
}
}
}
#endif
nb_fb = 0;
@ -861,7 +861,7 @@ bool gfxSstWinClose()
//m_pScreen = NULL;
#endif
return true;
}
}
void gfxTextureBufferExt(gfxChipID_t tmu, uint32_t startAddress, gfxLOD_t lodmin, gfxLOD_t lodmax, gfxAspectRatio_t aspect, gfxTextureFormat_t fmt, uint32_t evenOdd)
{
@ -1778,7 +1778,7 @@ static void CorrectGamma(const FxU16 aGammaRamp[3][256])
res = -1;
fputs("ERROR: Replacement for SDL_SetGammaRamp unimplemented.\n", stderr);
WriteTrace(TraceGlitch, TraceDebug, "SDL_SetGammaRamp returned %d\r\n", res);
}
}
#endif
void gfxLoadGammaTable(uint32_t /*nentries*/, uint32_t *red, uint32_t *green, uint32_t *blue)

1
Source/Project64-video/Renderer/OGLtextures.cpp
View File

@ -17,7 +17,6 @@
#else // _WIN32
#include <stdlib.h>
#endif // _WIN32
#include "glide.h"
#include "glitchmain.h"
#include <stdio.h>
#include <stdlib.h>

1
Source/Project64-video/Renderer/Renderer.h
View File

@ -13,7 +13,6 @@
****************************************************************************/
#pragma once
#include <Project64-video/Renderer/types.h>
#include <glide.h>
void gfxClipWindow(uint32_t minx, uint32_t miny, uint32_t maxx, uint32_t maxy);
void gfxColorMask(bool rgb, bool a);

2
Source/Project64-video/Renderer/glitchmain.h
View File

@ -93,8 +93,6 @@ extern "C" {
}
#endif
#include "glide.h"
void init_geometry();
void init_textures();
void init_combiner();

38
Source/Project64-video/TextureEnhancer/TxInternal.h
View File

@ -52,42 +52,4 @@ typedef uint32_t uint32;
/* in-memory zlib texture compression */
#define GR_TEXFMT_GZ 0x8000
#if 0 /* this is here to remind me of other formats */
/* from 3Dfx Interactive Inc. glide.h */
#define GR_TEXFMT_8BIT 0x0
#define GR_TEXFMT_RGB_332 GR_TEXFMT_8BIT
#define GR_TEXFMT_YIQ_422 0x1
#define GR_TEXFMT_ALPHA_8 0x2 /* (0..0xFF) alpha */
#define GR_TEXFMT_INTENSITY_8 0x3 /* (0..0xFF) intensity */
#define GR_TEXFMT_ALPHA_INTENSITY_44 0x4
#define GR_TEXFMT_P_8 0x5 /* 8-bit palette */
#define GR_TEXFMT_RSVD0 0x6 /* GR_TEXFMT_P_8_RGBA */
#define GR_TEXFMT_P_8_6666 GR_TEXFMT_RSVD0
#define GR_TEXFMT_P_8_6666_EXT GR_TEXFMT_RSVD0
#define GR_TEXFMT_RSVD1 0x7
#define GR_TEXFMT_16BIT 0x8
#define GR_TEXFMT_ARGB_8332 GR_TEXFMT_16BIT
#define GR_TEXFMT_AYIQ_8422 0x9
#define GR_TEXFMT_RGB_565 0xa
#define GR_TEXFMT_ARGB_1555 0xb
#define GR_TEXFMT_ARGB_4444 0xc
#define GR_TEXFMT_ALPHA_INTENSITY_88 0xd
#define GR_TEXFMT_AP_88 0xe /* 8-bit alpha 8-bit palette */
#define GR_TEXFMT_RSVD2 0xf
#define GR_TEXFMT_RSVD4 GR_TEXFMT_RSVD2
/* from 3Dfx Interactive Inc. g3ext.h */
#define GR_TEXFMT_ARGB_CMP_FXT1 0x11
#define GR_TEXFMT_ARGB_8888 0x12
#define GR_TEXFMT_YUYV_422 0x13
#define GR_TEXFMT_UYVY_422 0x14
#define GR_TEXFMT_AYUV_444 0x15
#define GR_TEXFMT_ARGB_CMP_DXT1 0x16
#define GR_TEXFMT_ARGB_CMP_DXT2 0x17
#define GR_TEXFMT_ARGB_CMP_DXT3 0x18
#define GR_TEXFMT_ARGB_CMP_DXT4 0x19
#define GR_TEXFMT_ARGB_CMP_DXT5 0x1A
#define GR_TEXTFMT_RGB_888 0xFF
#endif
#endif /* __INTERNAL_H__ */