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

win32: add frame_count_mod to cg shaders

This commit is contained in:
OV2 2013-03-26 15:39:17 +01:00
parent 231f4eea8f
commit 157e2f51d4
6 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
win32/CCGShader.cpp
View File

@ -274,6 +274,10 @@ bool CCGShader::LoadShader(const char *path)
sprintf(keyName,"::shader%u",i); sprintf(keyName,"::shader%u",i);
strcpy(pass.cgShaderFile,conf.GetString(keyName,"")); strcpy(pass.cgShaderFile,conf.GetString(keyName,""));
sprintf(keyName,"::frame_count_mod%u",i);
pass.frameCounterMod = conf.GetInt(keyName,0);
shaderPasses.push_back(pass); shaderPasses.push_back(pass);
} }

1
win32/CCGShader.h
View File

@ -200,6 +200,7 @@ public:
cgScaleParams scaleParams; cgScaleParams scaleParams;
bool linearFilter; bool linearFilter;
bool filterSet; bool filterSet;
unsigned frameCounterMod;
char cgShaderFile[PATH_MAX]; char cgShaderFile[PATH_MAX];
} shaderPass; } shaderPass;
typedef struct _lookupTexture { typedef struct _lookupTexture {

7
win32/CD3DCG.cpp
View File

@ -332,6 +332,8 @@ bool CD3DCG::LoadShader(const TCHAR *shaderFile)
pass.linearFilter = it->linearFilter; pass.linearFilter = it->linearFilter;
} }
pass.frameCounterMod = it->frameCounterMod;
// paths in the meta file can be relative // paths in the meta file can be relative
_tfullpath(tempPath,_tFromChar(it->cgShaderFile),MAX_PATH); _tfullpath(tempPath,_tFromChar(it->cgShaderFile),MAX_PATH);
char *fileContents = ReadShaderFileContents(tempPath); char *fileContents = ReadShaderFileContents(tempPath);
@ -682,7 +684,10 @@ void CD3DCG::setShaderVars(int pass)
setProgramUniform(pass,"IN.video_size",&inputSize); setProgramUniform(pass,"IN.video_size",&inputSize);
setProgramUniform(pass,"IN.texture_size",&textureSize); setProgramUniform(pass,"IN.texture_size",&textureSize);
setProgramUniform(pass,"IN.output_size",&outputSize); setProgramUniform(pass,"IN.output_size",&outputSize);
setProgramUniform(pass,"IN.frame_count",&frameCnt); float shaderFrameCnt = frameCnt;
if(shaderPasses[pass].frameCounterMod)
shaderFrameCnt = (float)(frameCnt % shaderPasses[pass].frameCounterMod);
setProgramUniform(pass,"IN.frame_count",&shaderFrameCnt);
float frameDirection = GUI.rewinding?-1.0f:1.0f; float frameDirection = GUI.rewinding?-1.0f:1.0f;
setProgramUniform(pass,"IN.frame_direction",&frameDirection); setProgramUniform(pass,"IN.frame_direction",&frameDirection);

3
win32/CD3DCG.h
View File

@ -197,6 +197,7 @@ private:
typedef struct _shaderPass { typedef struct _shaderPass {
cgScaleParams scaleParams; cgScaleParams scaleParams;
bool linearFilter; bool linearFilter;
unsigned int frameCounterMod;
CGprogram cgVertexProgram, cgFragmentProgram; CGprogram cgVertexProgram, cgFragmentProgram;
LPDIRECT3DTEXTURE9 tex; LPDIRECT3DTEXTURE9 tex;
LPDIRECT3DVERTEXBUFFER9 vertexBuffer; LPDIRECT3DVERTEXBUFFER9 vertexBuffer;
@ -247,7 +248,7 @@ private:
LPDIRECT3DDEVICE9 pDevice; LPDIRECT3DDEVICE9 pDevice;
CGcontext cgContext; CGcontext cgContext;
float frameCnt; unsigned int frameCnt;
D3DXMATRIX mvp; D3DXMATRIX mvp;
public: public:

7
win32/CGLCG.cpp
View File

@ -344,6 +344,8 @@ bool CGLCG::LoadShader(const TCHAR *shaderFile)
pass.linearFilter = it->linearFilter; pass.linearFilter = it->linearFilter;
} }
pass.frameCounterMod = it->frameCounterMod;
// paths in the meta file can be relative // paths in the meta file can be relative
_tfullpath(tempPath,_tFromChar(it->cgShaderFile),MAX_PATH); _tfullpath(tempPath,_tFromChar(it->cgShaderFile),MAX_PATH);
char *fileContents = ReadShaderFileContents(tempPath); char *fileContents = ReadShaderFileContents(tempPath);
@ -666,7 +668,10 @@ void CGLCG::setShaderVars(int pass)
setProgram2fv(pass,"IN.video_size",inputSize); setProgram2fv(pass,"IN.video_size",inputSize);
setProgram2fv(pass,"IN.texture_size",textureSize); setProgram2fv(pass,"IN.texture_size",textureSize);
setProgram2fv(pass,"IN.output_size",outputSize); setProgram2fv(pass,"IN.output_size",outputSize);
setProgram1f(pass,"IN.frame_count",(float)frameCnt); unsigned int shaderFrameCnt = frameCnt;
if(shaderPasses[pass].frameCounterMod)
shaderFrameCnt %= shaderPasses[pass].frameCounterMod;
setProgram1f(pass,"IN.frame_count",(float)shaderFrameCnt);
setProgram1f(pass,"IN.frame_direction",GUI.rewinding?-1.0f:1.0f); setProgram1f(pass,"IN.frame_direction",GUI.rewinding?-1.0f:1.0f);
/* ORIG parameter /* ORIG parameter

3
win32/CGLCG.h
View File

@ -212,6 +212,7 @@ private:
typedef struct _shaderPass { typedef struct _shaderPass {
cgScaleParams scaleParams; cgScaleParams scaleParams;
bool linearFilter; bool linearFilter;
unsigned frameCounterMod;
CGprogram cgVertexProgram, cgFragmentProgram; CGprogram cgVertexProgram, cgFragmentProgram;
GLuint tex; GLuint tex;
GLuint fbo; GLuint fbo;
@ -256,7 +257,7 @@ private:
bool loadTGA(const TCHAR *filename, STGA& tgaFile); bool loadTGA(const TCHAR *filename, STGA& tgaFile);
CGcontext cgContext; CGcontext cgContext;
int frameCnt; unsigned int frameCnt;
static const GLfloat lut_coords[8]; static const GLfloat lut_coords[8];