Merging r6426 through r6466 from trunk to ogl-es branch

Note: Updated IShaderConstantSetCallBack not yet supported by ogl-es drivers


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@6467 dfc29bdd-3216-0410-991c-e03cc46cb475
This commit is contained in:
cutealien
2023-04-22 21:50:32 +00:00
parent e184e4aedb
commit 621bad3111
118 changed files with 12767 additions and 444 deletions

View File

@ -19,12 +19,17 @@ struct VS_OUTPUT
float4 Position : POSITION; // vertex position
float4 Diffuse : COLOR0; // vertex diffuse color
float2 TexCoord : TEXCOORD0; // tex coords
// float3 Tangent : TEXCOORD1; // Not used in this example, but additional values can be passed on as tex coords
// float3 Binormal : TEXCOORD2; // Not used in this example, but additional values can be passed on as tex coords
};
VS_OUTPUT vertexMain(in float4 vPosition : POSITION,
in float3 vNormal : NORMAL,
float2 texCoord : TEXCOORD0 )
VS_OUTPUT vertexMain( in float4 vPosition : POSITION
, in float3 vNormal : NORMAL
, float2 texCoord : TEXCOORD0
//,float3 Tangent : TEXCOORD1; // Used for Tangent when working with S3DVertexTangents
//,float3 Binormal : TEXCOORD2; // Used for Binormal when working with S3DVertexTangents
)
{
VS_OUTPUT Output;