From 7972afc350668346ae510737b88e29e5ec6982ef Mon Sep 17 00:00:00 2001 From: Shiny Metagross <30511800+ShinyMetagross@users.noreply.github.com> Date: Thu, 15 Sep 2022 09:40:24 -0700 Subject: [PATCH] Revert "Before moving boneSelector from unsigned complete" This reverts commit 8f2b8fa8789a5d4aff3890334e2f7368efa99572. --- .../rendering/gles/gles_renderstate.cpp | 5 -- src/common/rendering/gles/gles_renderstate.h | 1 - src/common/rendering/gles/gles_shader.cpp | 13 +-- src/common/rendering/gles/gles_shader.h | 1 - wadsrc/static/shaders_gles/glsl/main.vp | 86 ++----------------- 5 files changed, 10 insertions(+), 96 deletions(-) diff --git a/src/common/rendering/gles/gles_renderstate.cpp b/src/common/rendering/gles/gles_renderstate.cpp index 910c7ae20..76718f649 100644 --- a/src/common/rendering/gles/gles_renderstate.cpp +++ b/src/common/rendering/gles/gles_renderstate.cpp @@ -32,7 +32,6 @@ #include "gles_shader.h" #include "gles_renderer.h" #include "hw_lightbuffer.h" -#include "hw_bonebuffer.h" #include "gles_renderbuffers.h" #include "gles_hwtexture.h" #include "gles_buffers.h" @@ -252,7 +251,6 @@ bool FGLRenderState::ApplyShader() activeShader->cur->muTimer.Set((double)(screen->FrameTime - firstFrame) * (double)mShaderTimer / 1000.); activeShader->cur->muAlphaThreshold.Set(mAlphaThreshold); activeShader->cur->muClipSplit.Set(mClipSplit); - activeShader->cur->muBoneIndexBase.Set(-1); activeShader->cur->muSpecularMaterial.Set(mGlossiness, mSpecularLevel); activeShader->cur->muAddColor.Set(mStreamData.uAddColor); activeShader->cur->muTextureAddColor.Set(mStreamData.uTextureAddColor); @@ -351,9 +349,6 @@ bool FGLRenderState::ApplyShader() activeShader->cur->muLightRange.Set(range); } - int index = mBoneIndexBase; - activeShader->cur->muBoneIndexBase.Set(index); - return true; } diff --git a/src/common/rendering/gles/gles_renderstate.h b/src/common/rendering/gles/gles_renderstate.h index ed035d0f1..4dd8516ec 100644 --- a/src/common/rendering/gles/gles_renderstate.h +++ b/src/common/rendering/gles/gles_renderstate.h @@ -66,7 +66,6 @@ class FGLRenderState final : public FRenderState int lastTranslation = 0; int maxBoundMaterial = -1; size_t mLastMappedLightIndex = SIZE_MAX; - size_t mLastMappedBoneIndexBase = SIZE_MAX; IVertexBuffer *mCurrentVertexBuffer; int mCurrentVertexOffsets[2]; // one per binding point diff --git a/src/common/rendering/gles/gles_shader.cpp b/src/common/rendering/gles/gles_shader.cpp index bbb97d09c..daba34f6d 100644 --- a/src/common/rendering/gles/gles_shader.cpp +++ b/src/common/rendering/gles/gles_shader.cpp @@ -38,7 +38,6 @@ #include "shaderuniforms.h" #include "hw_viewpointuniforms.h" #include "hw_lightbuffer.h" -#include "hw_bonebuffer.h" #include "i_specialpaths.h" #include "printf.h" #include "version.h" @@ -322,12 +321,6 @@ bool FShader::Load(const char * name, const char * vert_prog_lump_, const char * // dynamic lights uniform ivec4 uLightRange; - // bone animation - uniform int uBoneIndexBase; - - // bone matrix buffers - uniform mat4 bones[NUM_UBO_BONES]; - // Blinn glossiness and specular level uniform vec2 uSpecularMaterial; @@ -398,11 +391,10 @@ bool FShader::Load(const char * name, const char * vert_prog_lump_, const char * FString vp_comb; assert(screen->mLights != NULL); - assert(screen->mBones != NULL); unsigned int lightbuffersize = screen->mLights->GetBlockSize(); - vp_comb.Format("#version 100\n#define NUM_UBO_LIGHTS %d\n#define NO_CLIPDISTANCE_SUPPORT\n#define NUM_UBO_BONES %d\n", lightbuffersize, screen->mBones->GetBlockSize()); + vp_comb.Format("#version 100\n#define NUM_UBO_LIGHTS %d\n#define NO_CLIPDISTANCE_SUPPORT\n", lightbuffersize); FString fp_comb = vp_comb; vp_comb << defines << i_data.GetChars(); @@ -537,8 +529,6 @@ bool FShader::Load(const char * name, const char * vert_prog_lump_, const char * glBindAttribLocation(shaderData->hShader, VATTR_VERTEX2, "aVertex2"); glBindAttribLocation(shaderData->hShader, VATTR_NORMAL, "aNormal"); glBindAttribLocation(shaderData->hShader, VATTR_NORMAL2, "aNormal2"); - glBindAttribLocation(shaderData->hShader, VATTR_BONEWEIGHT, "aBoneWeight"); - glBindAttribLocation(shaderData->hShader, VATTR_BONESELECTOR, "aBoneSelector"); glLinkProgram(shaderData->hShader); @@ -601,7 +591,6 @@ bool FShader::Load(const char * name, const char * vert_prog_lump_, const char * shaderData->muLightParms.Init(shaderData->hShader, "uLightAttr"); shaderData->muClipSplit.Init(shaderData->hShader, "uClipSplit"); shaderData->muLightRange.Init(shaderData->hShader, "uLightRange"); - shaderData->muBoneIndexBase.Init(shaderData->hShader, "uBoneIndexBase"); shaderData->muFogColor.Init(shaderData->hShader, "uFogColor"); shaderData->muDynLightColor.Init(shaderData->hShader, "uDynLightColor"); shaderData->muObjectColor.Init(shaderData->hShader, "uObjectColor"); diff --git a/src/common/rendering/gles/gles_shader.h b/src/common/rendering/gles/gles_shader.h index 217a8600f..72a242c1b 100644 --- a/src/common/rendering/gles/gles_shader.h +++ b/src/common/rendering/gles/gles_shader.h @@ -327,7 +327,6 @@ public: class ShaderVariantData FBufferedUniform4f muLightParms; FBufferedUniform2f muClipSplit; FBufferedUniform4i muLightRange; - FBufferedUniform1i muBoneIndexBase; FBufferedUniformPE muFogColor; FBufferedUniform4f muDynLightColor; FBufferedUniformPE muObjectColor; diff --git a/wadsrc/static/shaders_gles/glsl/main.vp b/wadsrc/static/shaders_gles/glsl/main.vp index a3f877bc2..9d78e38a1 100644 --- a/wadsrc/static/shaders_gles/glsl/main.vp +++ b/wadsrc/static/shaders_gles/glsl/main.vp @@ -10,8 +10,6 @@ varying vec4 vColor; attribute vec4 aVertex2; attribute vec4 aNormal; attribute vec4 aNormal2; -attribute vec4 aBoneWeight; -attribute vec4 aBoneSelector; varying vec4 pixelpos; varying vec3 glowdist; @@ -25,25 +23,15 @@ varying vec4 ClipDistanceA; varying vec4 ClipDistanceB; #endif -struct BonesResult -{ - vec3 Normal; - vec4 Position; -}; - -BonesResult ApplyBones(); - void main() { float ClipDistance0, ClipDistance1, ClipDistance2, ClipDistance3, ClipDistance4; vec2 parmTexCoord; vec4 parmPosition; - - BonesResult bones = ApplyBones(); parmTexCoord = aTexCoord; - parmPosition = bones.Position; + parmPosition = aPosition; #ifndef SIMPLE vec4 worldcoord = ModelMatrix * mix(parmPosition, aVertex2, uInterpolationFactor); @@ -90,7 +78,14 @@ void main() ClipDistance4 = worldcoord.y - ((uSplitBottomPlane.w + uSplitBottomPlane.x * worldcoord.x + uSplitBottomPlane.y * worldcoord.z) * uSplitBottomPlane.z); } - vWorldNormal = NormalModelMatrix * vec4(normalize(bones.Normal), 1.0); + #ifdef HAS_UNIFORM_VERTEX_DATA + if ((useVertexData & 2) == 0) + vWorldNormal = NormalModelMatrix * vec4(uVertexNormal.xyz, 1.0); + else + vWorldNormal = NormalModelMatrix * vec4(normalize(mix(aNormal.xyz, aNormal2.xyz, uInterpolationFactor)), 1.0); + #else + vWorldNormal = NormalModelMatrix * vec4(normalize(mix(aNormal.xyz, aNormal2.xyz, uInterpolationFactor)), 1.0); + #endif vEyeNormal = NormalViewMatrix * vWorldNormal; #endif @@ -134,66 +129,3 @@ void main() gl_Position = ProjectionMatrix * eyeCoordPos; } - -#if !defined(SIMPLE) -vec3 GetAttrNormal() -{ - #ifdef HAS_UNIFORM_VERTEX_DATA - if ((useVertexData & 2) == 0) - return uVertexNormal.xyz; - else - return mix(aNormal.xyz, aNormal2.xyz, uInterpolationFactor); - #else - return mix(aNormal.xyz, aNormal2.xyz, uInterpolationFactor); - #endif -} - -void AddWeightedBone(int boneIndex, float weight, inout vec4 position, inout vec3 normal) -{ - if (weight != 0.0) - { - mat4 transform = bones[uBoneIndexBase + boneIndex]; - mat3 rotation = mat3(transform); - position += (transform * aPosition) * weight; - normal += (rotation * aNormal.xyz) * weight; - } -} - -BonesResult ApplyBones() -{ - BonesResult result; - if (uBoneIndexBase >= 0 && aBoneWeight != vec4(0.0)) - { - result.Position = vec4(0.0); - result.Normal = vec3(0.0); - - // We use low precision input for our bone weights. Rescale so the sum still is 1.0 - float totalWeight = aBoneWeight.x + aBoneWeight.y + aBoneWeight.z + aBoneWeight.w; - float weightMultiplier = 1.0 / totalWeight; - vec4 boneWeight = aBoneWeight * weightMultiplier; - - AddWeightedBone(int(aBoneSelector.x), boneWeight.x, result.Position, result.Normal); - AddWeightedBone(int(aBoneSelector.y), boneWeight.y, result.Position, result.Normal); - AddWeightedBone(int(aBoneSelector.z), boneWeight.z, result.Position, result.Normal); - AddWeightedBone(int(aBoneSelector.w), boneWeight.w, result.Position, result.Normal); - - result.Position.w = 1.0; // For numerical stability - } - else - { - result.Position = aPosition; - result.Normal = GetAttrNormal(); - } - return result; -} - -#else - -BonesResult ApplyBones() -{ - BonesResult result; - result.Position = aPosition; - return result; -} - -#endif