piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-24 06:39:46 -06:00
Code Issues Packages Projects Releases Wiki Activity

D3D: Drop gamma parameter from util draw helper

Browse Source 
No longer needed as we perform gamma correction during the XFB copy.
This commit is contained in:
Stenzek
2018-05-02 21:58:56 +10:00
parent e89ac769fb
commit 7a745e5b0d
6 changed files with 20 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
Source/Core/VideoBackends/D3D/D3DUtil.cpp
View File

@ -487,11 +487,7 @@ static ID3D11SamplerState* point_copy_sampler = nullptr;
struct STQVertex
{
float x, y, z, u, v, w, g;
};
struct STSQVertex
{
float x, y, z, u, v, w, g;
float x, y, z, u, v, w;
};
struct ClearVertex
{
@ -589,7 +585,7 @@ void SetLinearCopySampler()
void drawShadedTexQuad(ID3D11ShaderResourceView* texture, const D3D11_RECT* rSource,
int SourceWidth, int SourceHeight, ID3D11PixelShader* PShader,
ID3D11VertexShader* VShader, ID3D11InputLayout* layout,
ID3D11GeometryShader* GShader, float Gamma, u32 slice)
ID3D11GeometryShader* GShader, u32 slice)
{
float sw = 1.0f / (float)SourceWidth;
float sh = 1.0f / (float)SourceHeight;
@ -598,18 +594,17 @@ void drawShadedTexQuad(ID3D11ShaderResourceView* texture, const D3D11_RECT* rSou
float v1 = ((float)rSource->top) * sh;
float v2 = ((float)rSource->bottom) * sh;
float S = (float)slice;
float G = 1.0f / Gamma;
STQVertex coords[4] = {
{-1.0f, 1.0f, 0.0f, u1, v1, S, G},
{1.0f, 1.0f, 0.0f, u2, v1, S, G},
{-1.0f, -1.0f, 0.0f, u1, v2, S, G},
{1.0f, -1.0f, 0.0f, u2, v2, S, G},
{-1.0f, 1.0f, 0.0f, u1, v1, S},
{1.0f, 1.0f, 0.0f, u2, v1, S},
{-1.0f, -1.0f, 0.0f, u1, v2, S},
{1.0f, -1.0f, 0.0f, u2, v2, S},
};
// only upload the data to VRAM if it changed
if (stq_observer || tex_quad_data.u1 != u1 || tex_quad_data.v1 != v1 || tex_quad_data.u2 != u2 ||
tex_quad_data.v2 != v2 || tex_quad_data.S != S || tex_quad_data.G != G)
tex_quad_data.v2 != v2 || tex_quad_data.S != S)
{
stq_offset = util_vbuf->AppendData(coords, sizeof(coords), sizeof(STQVertex));
stq_observer = false;
@ -619,7 +614,6 @@ void drawShadedTexQuad(ID3D11ShaderResourceView* texture, const D3D11_RECT* rSou
tex_quad_data.u2 = u2;
tex_quad_data.v2 = v2;
tex_quad_data.S = S;
tex_quad_data.G = G;
}
UINT stride = sizeof(STQVertex);
UINT offset = 0;