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

win32: use color in d3d stock shader, pass valid color values

This commit is contained in:
OV2 2013-03-29 11:46:56 +01:00
parent f250cc14ab
commit a00858a6be
2 changed files with 26 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
gfx/d3d9/render_chain.cpp
View File

@ -24,17 +24,27 @@
namespace Global
{
static const char *stock_program =
"void main_vertex(out float4 oPos : POSITION, float4 pos : POSITION,\n"
" out float2 oTex : TEXCOORD0, float2 tex : TEXCOORD0,\n"
" uniform float4x4 modelViewProj)\n"
"{\n"
" oPos = mul(modelViewProj, pos);\n"
" oTex = tex;\n"
"}\n"
"float4 main_fragment(uniform sampler2D samp, float2 tex : TEXCOORD0) : COLOR\n"
"{\n"
" return tex2D(samp, tex);\n"
"void main_vertex"
"("
" float4 position : POSITION,"
" float2 texCoord : TEXCOORD0,"
" float4 color : COLOR,"
""
" uniform float4x4 modelViewProj,"
""
" out float4 oPosition : POSITION,"
" out float2 otexCoord : TEXCOORD0,"
" out float4 oColor : COLOR"
")"
"{"
" oPosition = mul(modelViewProj, position);"
" otexCoord = texCoord;"
" oColor = color;"
"}"
""
"float4 main_fragment(in float4 color : COLOR, float2 tex : TEXCOORD0, uniform sampler2D s0 : TEXUNIT0) : COLOR"
"{"
" return color * tex2D(s0, tex);"
"}";
}
@ -382,7 +392,10 @@ void RenderChain::set_vertices(Pass &pass,
float _v = static_cast<float>(height) / info.tex_h;
Vertex vert[4];
for (unsigned i = 0; i < 4; i++)
{
vert[i].z = 0.5f;
vert[i].r = vert[i].g = vert[i].b = vert[i].a = 1.0f;
}
vert[0].x = 0.0f;
vert[1].x = out_width;
@ -909,7 +922,7 @@ void RenderChain::init_fvf(Pass &pass)
static const D3DVERTEXELEMENT9 position_decl = DECL_FVF_POSITION(0);
static const D3DVERTEXELEMENT9 tex_coord0 = DECL_FVF_TEXCOORD(1, 3, 0);
static const D3DVERTEXELEMENT9 tex_coord1 = DECL_FVF_TEXCOORD(2, 5, 1);
static const D3DVERTEXELEMENT9 color = DECL_FVF_COLOR(3, 3, 0);
static const D3DVERTEXELEMENT9 color = DECL_FVF_COLOR(3, 7, 0);
D3DVERTEXELEMENT9 decl[MAXD3DDECLLENGTH] = {{0}};
if (cgD3D9GetVertexDeclaration(pass.vPrg, decl) == CG_FALSE)

1
gfx/d3d9/render_chain.hpp
View File

@ -27,6 +27,7 @@ struct Vertex
float x, y, z;
float u, v;
float lut_u, lut_v;
float r, g, b, a;
};
struct LinkInfo