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

Implement remaining xbox functions

This commit is contained in:
Anthony Miles 2019-11-30 21:03:37 +13:00 committed by patrickvl
parent 389e50a570
commit 21712cb4de
2 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/core/hle/D3D8/Direct3D9/Xb.hlsl
View File

@ -23,7 +23,7 @@ float4 c(int index);
static int a; // Xbox index register
int toXboxIndex(src0) {
int toXboxIndex(float src0) {
// The address register should be floored
// Due to rounding differences with the Xbox (and increased precision on PC?)
// some titles produce values just below the threshold of the next integer.
@ -36,7 +36,7 @@ float x_dph(float4 src0, float4 src1) {
return dot(src0, src1) + src1.w;
}
float4 x_sge(float4 a, float4 b) {
float4 x_sge(float4 src0, float4 src1) {
float4 dest;
dest.x = (src0.x >= src1.x) ? 1.0f : 0.0f;
dest.y = (src0.y >= src1.y) ? 1.0f : 0.0f;
@ -45,7 +45,7 @@ float4 x_sge(float4 a, float4 b) {
return dest;
}
float4 x_sge(float4 a, float4 src1) {
float4 x_sle(float4 src0, float4 src1) {
float4 dest;
dest.x = (src0.x < src1.x) ? 1.0f : 0.0f;
dest.y = (src0.y < src1.y) ? 1.0f : 0.0f;
@ -66,6 +66,21 @@ float x_rcc(float src0) {
: clamp(r, -5.42101e-020, -1.84467e+019);
}
float4 x_lit(float4 src0) {
const float epsilon = 1.0 / 256.0;
float diffuse = src0.x;
float blinn = src0.y;
float specPower = clamp(src0.w, -(128 - epsilon), (128 - epsilon));
float4 dest;
dest.x = 1;
dest.y = max(diffuse, 0);
dest.z = diffuse > 0 ? pow(2, specPower * log(blinn)) : 0;
dest.w = 1;
return dest;
}
VS_OUTPUT main(const VS_INPUT xIn)
{
// Input registers
@ -100,7 +115,7 @@ VS_OUTPUT main(const VS_INPUT xIn)
// Insert Xbox shader here
<Xbox Shader>
// <Xbox Shader>
// Copy variables to output struct
VS_OUTPUT xOut;

4
src/core/hle/D3D8/XbVertexShader.cpp
View File

@ -3068,6 +3068,7 @@ std::string BuildShader(VSH_XBOX_SHADER* pShader) {
switch (xboxInstruction.MAC)
{
case MAC_NOP:
hlsl << "// NOP";
break;
case MAC_MOV:
hlsl << ToHlsl("dest = src0", xboxInstruction);
@ -3117,6 +3118,7 @@ std::string BuildShader(VSH_XBOX_SHADER* pShader) {
switch (xboxInstruction.ILU)
{
case ILU_NOP:
hlsl << "// NOP";
break;
case ILU_MOV:
hlsl << ToHlsl("dest = src0", xboxInstruction);
@ -3137,7 +3139,7 @@ std::string BuildShader(VSH_XBOX_SHADER* pShader) {
hlsl << ToHlsl("dest = x_log(src0)", xboxInstruction);
break;
case ILU_LIT:
hlsl << ToHlsl("// lit TODO", xboxInstruction);
hlsl << ToHlsl("dest = x_lit(src0)", xboxInstruction);
break;
default:
EmuLog(LOG_LEVEL::WARNING, "TODO message");