Emulation/mupen64plus-video-rice
1
0
Fork 0
mirror of https://github.com/mupen64plus/mupen64plus-video-rice.git synced 2024-05-31 18:27:44 -04:00
Code Issues Packages Projects Releases Wiki Activity

removed some #ifdef WIN32s

Browse source
This commit is contained in:
Richard Goedeken 2009-10-28 22:24:02 -04:00
parent 306e5ddc73
commit 4aab03ea1f
3 changed files with 42 additions and 49 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
src/Blender.h
View file

@ -41,27 +41,25 @@ protected:
CRender *m_pRender;
};
#if !defined(WIN32)
typedef enum _BLEND
{
BLEND_ZERO = 1,
BLEND_ONE = 2,
BLEND_SRCCOLOR = 3,
BLEND_INVSRCCOLOR = 4,
BLEND_SRCALPHA = 5,
BLEND_INVSRCALPHA = 6,
BLEND_DESTALPHA = 7,
BLEND_INVDESTALPHA = 8,
BLEND_DESTCOLOR = 9,
BLEND_INVDESTCOLOR = 10,
BLEND_SRCALPHASAT = 11,
BLEND_BOTHSRCALPHA = 12,
BLEND_BOTHINVSRCALPHA = 13,
BLEND_BLENDFACTOR = 14,
BLEND_INVBLENDFACTOR = 15,
BLEND_FORCE_DWORD = 0x7fffffff
} BLEND;
#endif
typedef enum _BLEND
{
BLEND_ZERO = 1,
BLEND_ONE = 2,
BLEND_SRCCOLOR = 3,
BLEND_INVSRCCOLOR = 4,
BLEND_SRCALPHA = 5,
BLEND_INVSRCALPHA = 6,
BLEND_DESTALPHA = 7,
BLEND_INVDESTALPHA = 8,
BLEND_DESTCOLOR = 9,
BLEND_INVDESTCOLOR = 10,
BLEND_SRCALPHASAT = 11,
BLEND_BOTHSRCALPHA = 12,
BLEND_BOTHINVSRCALPHA = 13,
BLEND_BLENDFACTOR = 14,
BLEND_INVBLENDFACTOR = 15,
BLEND_FORCE_DWORD = 0x7fffffff
} BLEND;
#endif

4
src/FrameBuffer.h
View file

@ -24,9 +24,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include "RenderTexture.h"
#include "TextureManager.h"
#if !defined(WIN32)
typedef int SURFFORMAT;
#endif
typedef int SURFFORMAT;
extern void TexRectToN64FrameBuffer_16b(uint32 x0, uint32 y0, uint32 width, uint32 height, uint32 dwTile);
extern void TexRectToFrameBuffer_8b(uint32 dwXL, uint32 dwYL, uint32 dwXH, uint32 dwYH, float t0u0, float t0v0, float t0u1, float t0v1, uint32 dwTile);

47
src/TextureFilters.h
View file

@ -56,32 +56,29 @@ void hq2x_32(uint8 *srcPtr, uint32 srcPitch, uint8 *dstPtr, uint32 dstPitch, int
void lq2x_16(uint8 *srcPtr, uint32 srcPitch, uint8 *dstPtr, uint32 dstPitch, int width, int height);
void lq2x_32(uint8 *srcPtr, uint32 srcPitch, uint8 *dstPtr, uint32 dstPitch, int width, int height);
#if !defined(WIN32)
typedef enum _IMAGE_FILEFORMAT
{
XIFF_BMP = 0,
XIFF_JPG = 1,
XIFF_TGA = 2,
XIFF_PNG = 3,
XIFF_DDS = 4,
XIFF_PPM = 5,
XIFF_DIB = 6,
XIFF_HDR = 7,
XIFF_PFM = 8,
XIFF_FORCE_DWORD = 0x7fffffff
} IMAGE_FILEFORMAT;
typedef struct _IMAGE_INFO
{
unsigned int Width;
unsigned int Height;
unsigned int Depth;
unsigned int MipLevels;
int Format; /* SURFFORMAT */
IMAGE_FILEFORMAT ImageFileFormat;
} IMAGE_INFO;
#endif
typedef enum _IMAGE_FILEFORMAT
{
XIFF_BMP = 0,
XIFF_JPG = 1,
XIFF_TGA = 2,
XIFF_PNG = 3,
XIFF_DDS = 4,
XIFF_PPM = 5,
XIFF_DIB = 6,
XIFF_HDR = 7,
XIFF_PFM = 8,
XIFF_FORCE_DWORD = 0x7fffffff
} IMAGE_FILEFORMAT;
typedef struct _IMAGE_INFO
{
unsigned int Width;
unsigned int Height;
unsigned int Depth;
unsigned int MipLevels;
int Format; /* SURFFORMAT */
IMAGE_FILEFORMAT ImageFileFormat;
} IMAGE_INFO;
#endif