From a48376efd96a01ae51cb93e6ff01cf923219dbf5 Mon Sep 17 00:00:00 2001 From: Twinaphex Date: Wed, 15 Aug 2012 12:30:08 +0200 Subject: [PATCH] (PSL1GHT) Move GCM macro method defines to sdk_defines.h --- console/rgl/ps3/rgl.cpp | 6 +----- ps3/sdk_defines.h | 14 ++++++++++++++ 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/console/rgl/ps3/rgl.cpp b/console/rgl/ps3/rgl.cpp index 31b29b13a4..e4f786f1a7 100644 --- a/console/rgl/ps3/rgl.cpp +++ b/console/rgl/ps3/rgl.cpp @@ -4329,11 +4329,7 @@ static void _RGLPlatformDestroyTexture( jsTexture* texture ) _RGLTextureTouchFBOs( texture ); } -#ifdef __PSL1GHT__ -#define CELL_GCM_METHOD_HEADER_TEXTURE_OFFSET(unit, val) (((val) << (18)) | ((0x00001a00) + (unit) * 0x20)) -#define CELL_GCM_METHOD_DATA_TEXTURE_OFFSET(val) (val) -#define CELL_GCM_METHOD_DATA_TEXTURE_CONTROL3(pitch, depth) ((pitch) | ((depth) << 20)) -#else +#ifndef __PSL1GHT__ #include #endif diff --git a/ps3/sdk_defines.h b/ps3/sdk_defines.h index 0b6d455519..5ef54d72e1 100644 --- a/ps3/sdk_defines.h +++ b/ps3/sdk_defines.h @@ -484,4 +484,18 @@ #define cellGcmSetShadeModeInline rxSetShadeModel #endif +/*============================================================ + GCM PROTOTYPES +============================================================ */ + +#ifdef __PSL1GHT__ +#define CELL_GCM_METHOD_HEADER_TEXTURE_OFFSET(unit, val) (((val) << (18)) | ((0x00001a00) + (unit) * 0x20)) +#define CELL_GCM_METHOD_DATA_TEXTURE_OFFSET(val) (val) +#define CELL_GCM_METHOD_DATA_TEXTURE_CONTROL3(pitch, depth) ((pitch) | ((depth) << 20)) +#define CELL_GCM_METHOD_DATA_TEXTURE_IMAGE_RECT(height, width) ((height) | ((width) << 16)) +#define CELL_GCM_METHOD_DATA_TEXTURE_FILTER(bias, min, mag, filter) (((bias)) | ((filter) << 13) | ((min) << 16) | ((mag) << 24)) +#define CELL_GCM_METHOD_DATA_TEXTURE_CONTROL0(val0, minlod, maxlod, filter) (((minlod << 2) | (filter) << 4) | (maxlod << 7) | (minlod << 19) | (val0 << 31)) +#define CELL_GCM_METHOD_DATA_TEXTURE_ADDRESS(wraps, wrapt, wrapr, unsignedremap, zfunc, gamma) ((wraps) | ((0) << 4) | ((wrapt) << 8) | (unsignedremap << 12) | ((wrapr) << 16) | (gamma << 20) | (zfunc << 28)) +#endif + #endif