mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-28 08:37:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

(RGL PS3) Remove runtime semantics

Browse Source
This commit is contained in:
twinaphex 2013-03-27 20:51:03 +01:00
parent 5a43f485d9
commit 8aaf6bea39
2 changed files with 23 additions and 127 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ps3/rgl/include/Cg/CgCommon.h
View File

@ -6,7 +6,6 @@
#include "../export/RGL/rgl.h" #include "../export/RGL/rgl.h"
#include "../RGL/private.h" #include "../RGL/private.h"
#include <vector>
#include <string> #include <string>
#include "Cg/CgInternal.h" #include "Cg/CgInternal.h"
@ -55,7 +54,6 @@ typedef struct
typedef struct typedef struct
{ {
CgRuntimeParameter* param; CgRuntimeParameter* param;
std::vector<char> semantic;
} CgRuntimeSemantic; } CgRuntimeSemantic;
struct _CGprogram struct _CGprogram
@ -126,9 +124,6 @@ struct _CGprogram
_CGprogramGroup *programGroup; _CGprogramGroup *programGroup;
int programIndexInGroup; int programIndexInGroup;
// supports runtime allocation of semantics
std::vector<CgRuntimeSemantic> parameterSemantics;
//runtime compilation / conversion //runtime compilation / conversion
void *runtimeElf; void *runtimeElf;
}; };

145
ps3/rgl/src/ps3/rgl_ps3_cg.cpp
View File

@ -987,17 +987,6 @@ static CGparameter rglAdvanceParameter( CGparameter param, int distance )
void rglCgDestroyContextParam( CgRuntimeParameter* ptr ) void rglCgDestroyContextParam( CgRuntimeParameter* ptr )
{ {
std::vector<CgRuntimeSemantic>::iterator semanticIter = ptr->program->parameterSemantics.begin();
while ( semanticIter != ptr->program->parameterSemantics.end() )
{
if ( semanticIter->param == ptr )
{
ptr->program->parameterSemantics.erase( semanticIter );
break;
}
semanticIter++;
}
if ( _cgParameterDestroyHook ) _cgParameterDestroyHook( ptr ); if ( _cgParameterDestroyHook ) _cgParameterDestroyHook( ptr );
rglEraseName( &_CurrentContext->cgParameterNameSpace, (unsigned int)( ptr->id ) ); rglEraseName( &_CurrentContext->cgParameterNameSpace, (unsigned int)( ptr->id ) );
@ -1562,49 +1551,31 @@ CG_API const char* cgGetParameterSemantic( CGparameter param )
CgRuntimeParameter *rtParameter = ( CgRuntimeParameter* )rglCgGLTestParameter( param ); CgRuntimeParameter *rtParameter = ( CgRuntimeParameter* )rglCgGLTestParameter( param );
if ( !rtParameter ) if ( !rtParameter )
return NULL; return NULL;
else
const CgParameterEntry *parameterEntry = rtParameter->parameterEntry;
unsigned short type = parameterEntry->flags & CGP_TYPE_MASK;
if ( type == CGP_STRUCTURE || CGP_STRUCTURE == CGP_ARRAY )
{ {
const CgParameterEntry *parameterEntry = rtParameter->parameterEntry; rglCgRaiseError( CG_INVALID_PARAMETER_ERROR );
return NULL;
unsigned short type = parameterEntry->flags & CGP_TYPE_MASK;
if ( type == CGP_STRUCTURE || CGP_STRUCTURE == CGP_ARRAY )
{
rglCgRaiseError( CG_INVALID_PARAMETER_ERROR );
return NULL;
}
// this table holds semantics that were created at runtime for either program or context or effect scope parameters
// this search happens first because you can overwrite what was set in the binary at runtime
// and we won't remove the entry from the binary representation of semantics
// but we will add an entry into this table which should be returned here.
std::vector<CgRuntimeSemantic>::iterator semanticIter = rtParameter->program->parameterSemantics.begin();
while ( semanticIter != rtParameter->program->parameterSemantics.end() )
{
if ( semanticIter->param == rtParameter )
{
return &semanticIter->semantic[0];
}
semanticIter++;
}
size_t entryIndex = ( parameterEntry - rtParameter->program->parametersEntries );
//look for the parameter semantic in the semantic table for semantics set in the compiled source
int count = rtParameter->program->semanticCount;
int i;
for ( i = 0;i < count;i++ )
{
const CgParameterSemantic *semantic = rtParameter->program->semanticIndices + i;
if ( semantic->entryIndex == ( unsigned short )entryIndex )
{
//found
return rtParameter->program->stringTable + semantic->semanticOffset;
}
}
//not found, we don't have the semantic for this parameter, returns empty strings
return "";
} }
size_t entryIndex = ( parameterEntry - rtParameter->program->parametersEntries );
//look for the parameter semantic in the semantic table for semantics set in the compiled source
int count = rtParameter->program->semanticCount;
int i;
for ( i = 0;i < count;i++ )
{
const CgParameterSemantic *semantic = rtParameter->program->semanticIndices + i;
if ( semantic->entryIndex == ( unsigned short )entryIndex )
return rtParameter->program->stringTable + semantic->semanticOffset; // found
}
//not found, we don't have the semantic for this parameter, returns empty strings
return "";
} }
static bool rglPrependString( char *dst, const char *src, size_t size ) static bool rglPrependString( char *dst, const char *src, size_t size )
@ -1754,71 +1725,6 @@ CG_API CGenum cgGetParameterDirection( CGparameter param )
} }
} }
CG_API void cgSetParameterSemantic( CGparameter param, const char* semantic )
{
// check parameter handle
if ( RGL_UNLIKELY( !CG_IS_PARAMETER( param ) ) )
{
rglCgRaiseError( CG_INVALID_PARAM_HANDLE_ERROR );
return;
}
CgRuntimeParameter* rtParameter = ( CgRuntimeParameter* )rglCgGLTestParameter( param );
unsigned short type = rtParameter->parameterEntry->flags & CGP_TYPE_MASK;
if ( type == CGP_STRUCTURE || CGP_STRUCTURE == CGP_ARRAY )
{
rglCgRaiseError( CG_INVALID_PARAMETER_ERROR );
return;
}
// first see if the parameter already has this semantic set from compile time, in which case, just return, it is already set
size_t entryIndex = ( rtParameter->parameterEntry - rtParameter->program->parametersEntries ) / sizeof( CgParameterEntry );
//look for the parameter semantic in the semantic table for semantics set in the compiled source
int count = rtParameter->program->semanticCount;
int i;
for ( i = 0;i < count;i++ )
{
const CgParameterSemantic *semanticEntry = rtParameter->program->semanticIndices + i;
if ( semanticEntry->entryIndex == ( unsigned short )entryIndex )
{
//found the semantic for this parameter
if ( strcmp( semantic, rtParameter->program->stringTable + semanticEntry->semanticOffset ) == 0 )
{
// if it already has the value we want, just return
return;
}
else
{
// if it has a different value, break out of this loop and give it a new one
break;
}
}
}
// this table holds semantics that were created at runtime for either program or context or effect scope parameters
// must check this table to see if the param already has one set, in which case the semantic should just be updated
std::vector<CgRuntimeSemantic>::iterator semanticIter = rtParameter->program->parameterSemantics.begin();
while ( semanticIter != rtParameter->program->parameterSemantics.end() )
{
if ( semanticIter->param == rtParameter )
{
// we found this parameter already has a runtime set semantic, reassign it.
semanticIter->semantic.clear();
semanticIter->semantic.insert( semanticIter->semantic.end(), semantic, semantic + strlen( semantic ) + 1 );
return;
}
semanticIter++;
}
// finally, if this parameter has no semantic yet, create an entry in the semantics table to store this semantic
CgRuntimeSemantic newSemanticEntry;
newSemanticEntry.param = rtParameter;
newSemanticEntry.semantic.clear();
newSemanticEntry.semantic.insert( newSemanticEntry.semantic.end(), semantic, semantic + strlen( semantic ) + 1 );
rtParameter->program->parameterSemantics.push_back( newSemanticEntry );
}
/*============================================================ /*============================================================
CG TOKENS CG TOKENS
============================================================ */ ============================================================ */
@ -2449,11 +2355,6 @@ void rglCgProgramErase( _CGprogram* prog )
break; break;
} }
// free allocated memory in these stl containers.
// Current clear() implementation deallocates the memory.
// Is it better to explicitly call a "destructor" of this prog before freeing its memory?
prog->parameterSemantics.clear();
// return program and node to free store // return program and node to free store
if ( prog->id ) rglEraseName( &_CurrentContext->cgProgramNameSpace, (unsigned int)prog->id ); if ( prog->id ) rglEraseName( &_CurrentContext->cgProgramNameSpace, (unsigned int)prog->id );