Merge pull request #904 from raven02/patch-1

Temporary disable compile_shader()
This commit is contained in:
B1ackDaemon 2014-12-17 17:21:19 +02:00
commit 621864be18
1 changed files with 5 additions and 5 deletions

View File

@ -48,7 +48,7 @@ typedef be_t<uint> CGresource;
typedef be_t<uint> CGenum; typedef be_t<uint> CGenum;
typedef be_t<uint> CGtype; typedef be_t<uint> CGtype;
typedef be_t<unsigned int> CgBinaryOffset; typedef be_t<unsigned int> CgBinaryOffset;
typedef CgBinaryOffset CgBinaryEmbeddedConstantOffset; typedef CgBinaryOffset CgBinaryEmbeddedConstantOffset;
typedef CgBinaryOffset CgBinaryFloatOffset; typedef CgBinaryOffset CgBinaryFloatOffset;
typedef CgBinaryOffset CgBinaryStringOffset; typedef CgBinaryOffset CgBinaryStringOffset;
@ -74,13 +74,13 @@ struct CgBinaryParameter
CGtype type; // cgGetParameterType() CGtype type; // cgGetParameterType()
CGresource res; // cgGetParameterResource() CGresource res; // cgGetParameterResource()
CGenum var; // cgGetParameterVariability() CGenum var; // cgGetParameterVariability()
be_t<int> resIndex; // cgGetParameterResourceIndex() be_t<int> resIndex; // cgGetParameterResourceIndex()
CgBinaryStringOffset name; // cgGetParameterName() CgBinaryStringOffset name; // cgGetParameterName()
CgBinaryFloatOffset defaultValue; // default constant value CgBinaryFloatOffset defaultValue; // default constant value
CgBinaryEmbeddedConstantOffset embeddedConst; // embedded constant information CgBinaryEmbeddedConstantOffset embeddedConst; // embedded constant information
CgBinaryStringOffset semantic; // cgGetParameterSemantic() CgBinaryStringOffset semantic; // cgGetParameterSemantic()
CGenum direction; // cgGetParameterDirection() CGenum direction; // cgGetParameterDirection()
be_t<int> paramno; // 0..n: cgGetParameterIndex() -1: globals be_t<int> paramno; // 0..n: cgGetParameterIndex() -1: globals
CGbool isReferenced; // cgIsParameterReferenced() CGbool isReferenced; // cgIsParameterReferenced()
CGbool isShared; // cgIsParameterShared() CGbool isShared; // cgIsParameterShared()
}; };
@ -303,8 +303,8 @@ bool Rpcs3App::OnInit()
OnArguments(); OnArguments();
compile_shader("compile_shader0.spo"); //compile_shader("compile_shader0.spo");
compile_shader("compile_shader1.spo"); //compile_shader("compile_shader1.spo");
return true; return true;
} }