mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-02-21 09:39:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

(PS3) Some cleanups to RGL

Browse Source
This commit is contained in:
Twinaphex 2012-05-26 06:20:14 +02:00
parent 69ffd1c7a7
commit 95a236ac61
5 changed files with 113 additions and 140 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

131
console/rgl/ps3/cgbio.hpp
View File

@ -11,25 +11,18 @@
#define CGF_DEPTHREPLACE 0x02
#define CGF_PIXELKILL 0x04
typedef unsigned int Elf32_Addr;
typedef unsigned short Elf32_Half;
typedef short Elf32_Shalf;
typedef unsigned int Elf32_Off;
typedef signed int Elf32_Sword;
typedef unsigned int Elf32_Word;
typedef size_t ptrdiff_t;
typedef size_t ptrdiff_t;
typedef struct _Elf32_cgParameter {
Elf32_Word cgp_name;
Elf32_Word cgp_semantic;
Elf32_Half cgp_default;
Elf32_Half cgp_reloc;
Elf32_Half cgp_resource;
Elf32_Half cgp_resource_index;
unsigned int cgp_name;
unsigned int cgp_semantic;
unsigned short cgp_default;
unsigned short cgp_reloc;
unsigned short cgp_resource;
unsigned short cgp_resource_index;
unsigned char cgp_type;
Elf32_Half cgp_info;
unsigned short cgp_info;
unsigned char unused;
} Elf32_cgParameter;
@ -182,77 +175,77 @@ typedef struct _Elf32_cgParameter {
struct Elf32_Ehdr {
unsigned char e_ident[EI_NIDENT];
Elf32_Half e_type;
Elf32_Half e_machine;
Elf32_Word e_version;
Elf32_Addr e_entry;
Elf32_Off e_phoff;
Elf32_Off e_shoff;
Elf32_Word e_flags;
Elf32_Half e_ehsize;
Elf32_Half e_phentsize;
Elf32_Half e_phnum;
Elf32_Half e_shentsize;
Elf32_Half e_shnum;
Elf32_Half e_shstrndx;
unsigned short e_type;
unsigned short e_machine;
unsigned int e_version;
unsigned int e_entry;
unsigned int e_phoff;
unsigned int e_shoff;
unsigned int e_flags;
unsigned short e_ehsize;
unsigned short e_phentsize;
unsigned short e_phnum;
unsigned short e_shentsize;
unsigned short e_shnum;
unsigned short e_shstrndx;
};
struct Elf32_Shdr {
Elf32_Word sh_name;
Elf32_Word sh_type;
Elf32_Word sh_flags;
Elf32_Addr sh_addr;
Elf32_Off sh_offset;
Elf32_Word sh_size;
Elf32_Word sh_link;
Elf32_Word sh_info;
Elf32_Word sh_addralign;
Elf32_Word sh_entsize;
unsigned int sh_name;
unsigned int sh_type;
unsigned int sh_flags;
unsigned int sh_addr;
unsigned int sh_offset;
unsigned int sh_size;
unsigned int sh_link;
unsigned int sh_info;
unsigned int sh_addralign;
unsigned int sh_entsize;
};
struct Elf32_Phdr {
Elf32_Word p_type;
Elf32_Off p_offset;
Elf32_Addr p_vaddr;
Elf32_Addr p_paddr;
Elf32_Word p_filesz;
Elf32_Word p_memsz;
Elf32_Word p_flags;
Elf32_Word p_align;
unsigned int p_type;
unsigned int p_offset;
unsigned int p_vaddr;
unsigned int p_paddr;
unsigned int p_filesz;
unsigned int p_memsz;
unsigned int p_flags;
unsigned int p_align;
};
struct Elf32_Sym {
Elf32_Word st_name;
Elf32_Addr st_value;
Elf32_Word st_size;
unsigned int st_name;
unsigned int st_value;
unsigned int st_size;
unsigned char st_info;
unsigned char st_other;
Elf32_Half st_shndx;
unsigned short st_shndx;
};
struct Elf32_Note {
Elf32_Word n_namesz; /* Name size */
Elf32_Word n_descsz; /* Content size */
Elf32_Word n_type; /* Content type */
unsigned int n_namesz; /* Name size */
unsigned int n_descsz; /* Content size */
unsigned int n_type; /* Content type */
};
struct Elf32_Rel {
Elf32_Addr r_offset;
Elf32_Word r_info;
unsigned int r_offset;
unsigned int r_info;
};
struct Elf32_Rela {
Elf32_Addr r_offset;
Elf32_Word r_info;
Elf32_Sword r_addend;
unsigned int r_offset;
unsigned int r_info;
signed int r_addend;
};
struct Elf32_Dyn {
Elf32_Sword d_tag;
signed int d_tag;
union {
Elf32_Word d_val;
Elf32_Addr d_ptr;
unsigned int d_val;
unsigned int d_ptr;
} d_un;
};
@ -381,16 +374,16 @@ class isection
virtual int reference() const = 0;
virtual int release() const = 0;
virtual Elf32_Half index() const = 0;
virtual unsigned short index() const = 0;
virtual char *name() const = 0;
virtual Elf32_Word type() const = 0;
virtual Elf32_Word flags() const = 0;
virtual Elf32_Addr addr() const = 0;
virtual Elf32_Word size() const = 0;
virtual Elf32_Word link() const = 0;
virtual Elf32_Word info() const = 0;
virtual Elf32_Word addralign() const = 0;
virtual Elf32_Word entsize() const = 0;
virtual unsigned int type() const = 0;
virtual unsigned int flags() const = 0;
virtual unsigned int addr() const = 0;
virtual unsigned int size() const = 0;
virtual unsigned int link() const = 0;
virtual unsigned int info() const = 0;
virtual unsigned int addralign() const = 0;
virtual unsigned int entsize() const = 0;
virtual const char* data() const = 0;
};

21
console/rgl/ps3/cgnv2rt.cpp
View File

@ -109,7 +109,7 @@ static unsigned int stringTableAdd( STL_NAMESPACE vector<char> &stringTable, con
static unsigned int stringTableAddUnique( STL_NAMESPACE vector<char> &stringTable, const char* str );
template<class Type> static size_t array_size(STL_NAMESPACE vector<Type> &array);
template<class Type> static void array_push(char* &parameterOffset, STL_NAMESPACE vector<Type> &array);
inline static Elf32_Word swap16(const Elf32_Word v);
inline static unsigned int swap16(const unsigned int v);
static unsigned short getFlags(CGenum var, CGenum dir, int no, bool is_referenced, bool is_shared, int paramIndex);
static void fillStructureItems(_CGNVCONTAINERS &containers, CgStructureType *structure,
@ -211,16 +211,16 @@ int convertNvToElfFromMemory(const void *sourceData, size_t size, int endianness
cgShader.fragmentProgram.flags = CNV2END(flags);
}
Elf32_Word *tmp = (Elf32_Word *)nvbr->ucode();
unsigned int *tmp = (unsigned int *)nvbr->ucode();
const char *ucode;
Elf32_Word *buffer = NULL;
unsigned int *buffer = NULL;
if (doSwap)
{
int size = (int)nvbr->ucode_size()/sizeof(Elf32_Word);
buffer = new Elf32_Word[size];
int size = (int)nvbr->ucode_size()/sizeof(unsigned int);
buffer = new unsigned int[size];
for (int i=0;i<size;i++)
{
Elf32_Word val = ENDSWAP(tmp[i]);
unsigned int val = ENDSWAP(tmp[i]);
if (!bIsVertexProgram)
val = swap16(val);
buffer[i] = val;
@ -230,8 +230,8 @@ int convertNvToElfFromMemory(const void *sourceData, size_t size, int endianness
else
{
ucode = (const char*)tmp;
int size = (int)nvbr->ucode_size()/sizeof(Elf32_Word);
buffer = new Elf32_Word[size];
int size = (int)nvbr->ucode_size()/sizeof(unsigned int);
buffer = new unsigned int[size];
for (int i=0;i<size;i++)
{
buffer[i] = tmp[i];
@ -1033,7 +1033,7 @@ template<class Type> static void array_push(char* &parameterOffset, STL_NAMESPAC
parameterOffset += dataSize;
}
Elf32_Word inline static swap16(const Elf32_Word v)
unsigned int inline static swap16(const unsigned int v)
{
return (v>>16) | (v<<16);
}
@ -1041,7 +1041,8 @@ Elf32_Word inline static swap16(const Elf32_Word v)
unsigned short getFlags(CGenum var, CGenum dir, int no, bool is_referenced, bool is_shared, int paramIndex)
{
(void)paramIndex;
Elf32_Half flags = 0;
unsigned short flags = 0;
if (var == CG_VARYING)
flags |= CGPV_VARYING;
else if (var == CG_UNIFORM)

86
console/rgl/ps3/elf.h
View File

@ -3,12 +3,6 @@
#define RGL_ALIGN_FAST_TRANSFER 128
typedef unsigned int Elf32_Addr;
typedef unsigned int Elf32_Off;
typedef unsigned short Elf32_Half;
typedef unsigned int Elf32_Word;
typedef int Elf32_Sword;
#define EI_MAG0 0
#define EI_MAG1 1
#define EI_MAG2 2
@ -48,19 +42,19 @@ typedef int Elf32_Sword;
typedef struct {
unsigned char e_ident[EI_NIDENT];
Elf32_Half e_type;
Elf32_Half e_machine;
Elf32_Word e_version;
Elf32_Addr e_entry;
Elf32_Off e_phoff;
Elf32_Off e_shoff;
Elf32_Word e_flags;
Elf32_Half e_ehsize;
Elf32_Half e_phentsize;
Elf32_Half e_phnum;
Elf32_Half e_shentsize;
Elf32_Half e_shnum;
Elf32_Half e_shstrndx;
unsigned short e_type;
unsigned short e_machine;
unsigned int e_version;
unsigned int e_entry;
unsigned int e_phoff;
unsigned int e_shoff;
unsigned int e_flags;
unsigned short e_ehsize;
unsigned short e_phentsize;
unsigned short e_phnum;
unsigned short e_shentsize;
unsigned short e_shnum;
unsigned short e_shstrndx;
} Elf32_Ehdr;
#define PT_NULL 0
@ -76,14 +70,14 @@ typedef struct {
#define PT_HIPROC 0x7fffffff
typedef struct {
Elf32_Word p_type;
Elf32_Off p_offset;
Elf32_Addr p_vaddr;
Elf32_Addr p_paddr;
Elf32_Word p_filesz;
Elf32_Word p_memsz;
Elf32_Word p_flags;
Elf32_Word p_align;
unsigned int p_type;
unsigned int p_offset;
unsigned int p_vaddr;
unsigned int p_paddr;
unsigned int p_filesz;
unsigned int p_memsz;
unsigned int p_flags;
unsigned int p_align;
} Elf32_Phdr;
#define SHT_NULL 0
@ -112,16 +106,16 @@ typedef struct {
typedef struct {
Elf32_Word sh_name;
Elf32_Word sh_type;
Elf32_Word sh_flags;
Elf32_Addr sh_addr;
Elf32_Off sh_offset;
Elf32_Word sh_size;
Elf32_Word sh_link;
Elf32_Word sh_info;
Elf32_Word sh_addralign;
Elf32_Word sh_entsize;
unsigned int sh_name;
unsigned int sh_type;
unsigned int sh_flags;
unsigned int sh_addr;
unsigned int sh_offset;
unsigned int sh_size;
unsigned int sh_link;
unsigned int sh_info;
unsigned int sh_addralign;
unsigned int sh_entsize;
} Elf32_Shdr;
#define SHN_UNDEF 0
@ -136,26 +130,26 @@ typedef struct {
#define SHN_HIRESERVE 0xffff
typedef struct {
Elf32_Word st_name;
Elf32_Word st_value;
Elf32_Word st_size;
unsigned int st_name;
unsigned int st_value;
unsigned int st_size;
unsigned char st_info;
unsigned char st_other;
Elf32_Half st_shndx;
unsigned short st_shndx;
} Elf32_Sym;
typedef struct
{
Elf32_Addr r_offset;
Elf32_Word r_info;
unsigned int r_offset;
unsigned int r_info;
} Elf32_Rel;
typedef struct
{
Elf32_Addr r_offset;
Elf32_Word r_info;
Elf32_Sword r_addend;
unsigned int r_offset;
unsigned int r_info;
int r_addend;
} Elf32_Rela;
#endif /* ELF_H */

5
console/rgl/ps3/rgl.cpp
View File

@ -5939,11 +5939,6 @@ GLAPI void APIENTRY glFinish (void)
_RGLFifoFinish( &_RGLState.fifo );
}
PSGLuint64 psglGetSystemTime()
{
return sys_time_get_system_time();
}
GLAPI const GLubyte* APIENTRY glGetString( GLenum name )
{
switch ( name )

10
console/rgl/ps3/rgl.h
View File

@ -1092,12 +1092,6 @@ void _RGLSetNativeCgFragmentProgram( const void *header );
clipY1 - clipY0, zNear, zFar, scale, offset );
}
#define PSGL_DEVICE_PARAMETERS_COLOR_FORMAT 0x0001
#define PSGL_DEVICE_PARAMETERS_DEPTH_FORMAT 0x0002
#define PSGL_DEVICE_PARAMETERS_MULTISAMPLING_MODE 0x0004
@ -1147,8 +1141,6 @@ void _RGLSetNativeCgFragmentProgram( const void *header );
#define PSGL_INIT_USE_PMQUERIES 0x0080
typedef unsigned long long int PSGLuint64;
extern void psglInit( PSGLinitOptions* options );
extern void psglExit();
@ -1167,8 +1159,6 @@ PSGLcontext* psglGetCurrentContext();
PSGLdevice* psglGetCurrentDevice();
void psglSwap( void );
PSGLuint64 psglGetSystemTime();
static inline void psglRescAdjustAspectRatio( const float horizontalScale, const float verticalScale )
{ cellRescAdjustAspectRatio( horizontalScale, verticalScale ); }