Remove glsl handle legacy related code
This commit is contained in:
		| @@ -176,7 +176,7 @@ void EmitCode(EmitContext& ctx, const IR::Program& program) { | |||||||
| } | } | ||||||
|  |  | ||||||
| std::string GlslVersionSpecifier(const EmitContext& ctx) { | std::string GlslVersionSpecifier(const EmitContext& ctx) { | ||||||
|     if (ctx.uses_y_direction || ctx.info.stores.Legacy() || ctx.info.loads.Legacy()) { |     if (ctx.uses_y_direction) { | ||||||
|         return " compatibility"; |         return " compatibility"; | ||||||
|     } |     } | ||||||
|     return ""; |     return ""; | ||||||
|   | |||||||
| @@ -98,10 +98,6 @@ void GetCbuf16(EmitContext& ctx, IR::Inst& inst, const IR::Value& binding, const | |||||||
|         GetCbuf(ctx, ret, binding, offset, 16, cast, bit_offset); |         GetCbuf(ctx, ret, binding, offset, 16, cast, bit_offset); | ||||||
|     } |     } | ||||||
| } | } | ||||||
|  |  | ||||||
| u32 TexCoordIndex(IR::Attribute attr) { |  | ||||||
|     return (static_cast<u32>(attr) - static_cast<u32>(IR::Attribute::FixedFncTexture0S)) / 4; |  | ||||||
| } |  | ||||||
| } // Anonymous namespace | } // Anonymous namespace | ||||||
|  |  | ||||||
| void EmitGetCbufU8(EmitContext& ctx, IR::Inst& inst, const IR::Value& binding, | void EmitGetCbufU8(EmitContext& ctx, IR::Inst& inst, const IR::Value& binding, | ||||||
| @@ -190,18 +186,6 @@ void EmitGetAttribute(EmitContext& ctx, IR::Inst& inst, IR::Attribute attr, | |||||||
|         ctx.AddF32("{}=in_attr{}{}.{};", inst, index, InputVertexIndex(ctx, vertex), swizzle); |         ctx.AddF32("{}=in_attr{}{}.{};", inst, index, InputVertexIndex(ctx, vertex), swizzle); | ||||||
|         return; |         return; | ||||||
|     } |     } | ||||||
|     // GLSL only exposes 8 legacy texcoords |  | ||||||
|     if (attr >= IR::Attribute::FixedFncTexture8S && attr <= IR::Attribute::FixedFncTexture9Q) { |  | ||||||
|         LOG_WARNING(Shader_GLSL, "GLSL does not allow access to gl_TexCoord[{}]", |  | ||||||
|                     TexCoordIndex(attr)); |  | ||||||
|         ctx.AddF32("{}=0.f;", inst); |  | ||||||
|         return; |  | ||||||
|     } |  | ||||||
|     if (attr >= IR::Attribute::FixedFncTexture0S && attr <= IR::Attribute::FixedFncTexture7Q) { |  | ||||||
|         const u32 index{TexCoordIndex(attr)}; |  | ||||||
|         ctx.AddF32("{}=gl_TexCoord[{}].{};", inst, index, swizzle); |  | ||||||
|         return; |  | ||||||
|     } |  | ||||||
|     switch (attr) { |     switch (attr) { | ||||||
|     case IR::Attribute::PrimitiveId: |     case IR::Attribute::PrimitiveId: | ||||||
|         ctx.AddF32("{}=itof(gl_PrimitiveID);", inst); |         ctx.AddF32("{}=itof(gl_PrimitiveID);", inst); | ||||||
| @@ -215,16 +199,6 @@ void EmitGetAttribute(EmitContext& ctx, IR::Inst& inst, IR::Attribute attr, | |||||||
|         ctx.AddF32("{}={}{}.{};", inst, input_decorator, ctx.position_name, swizzle); |         ctx.AddF32("{}={}{}.{};", inst, input_decorator, ctx.position_name, swizzle); | ||||||
|         break; |         break; | ||||||
|     } |     } | ||||||
|     case IR::Attribute::ColorFrontDiffuseR: |  | ||||||
|     case IR::Attribute::ColorFrontDiffuseG: |  | ||||||
|     case IR::Attribute::ColorFrontDiffuseB: |  | ||||||
|     case IR::Attribute::ColorFrontDiffuseA: |  | ||||||
|         if (ctx.stage == Stage::Fragment) { |  | ||||||
|             ctx.AddF32("{}=gl_Color.{};", inst, swizzle); |  | ||||||
|         } else { |  | ||||||
|             ctx.AddF32("{}=gl_FrontColor.{};", inst, swizzle); |  | ||||||
|         } |  | ||||||
|         break; |  | ||||||
|     case IR::Attribute::PointSpriteS: |     case IR::Attribute::PointSpriteS: | ||||||
|     case IR::Attribute::PointSpriteT: |     case IR::Attribute::PointSpriteT: | ||||||
|         ctx.AddF32("{}=gl_PointCoord.{};", inst, swizzle); |         ctx.AddF32("{}=gl_PointCoord.{};", inst, swizzle); | ||||||
| @@ -264,17 +238,6 @@ void EmitSetAttribute(EmitContext& ctx, IR::Attribute attr, std::string_view val | |||||||
|     } |     } | ||||||
|     const u32 element{static_cast<u32>(attr) % 4}; |     const u32 element{static_cast<u32>(attr) % 4}; | ||||||
|     const char swizzle{"xyzw"[element]}; |     const char swizzle{"xyzw"[element]}; | ||||||
|     // GLSL only exposes 8 legacy texcoords |  | ||||||
|     if (attr >= IR::Attribute::FixedFncTexture8S && attr <= IR::Attribute::FixedFncTexture9Q) { |  | ||||||
|         LOG_WARNING(Shader_GLSL, "GLSL does not allow access to gl_TexCoord[{}]", |  | ||||||
|                     TexCoordIndex(attr)); |  | ||||||
|         return; |  | ||||||
|     } |  | ||||||
|     if (attr >= IR::Attribute::FixedFncTexture0S && attr <= IR::Attribute::FixedFncTexture7Q) { |  | ||||||
|         const u32 index{TexCoordIndex(attr)}; |  | ||||||
|         ctx.Add("gl_TexCoord[{}].{}={};", index, swizzle, value); |  | ||||||
|         return; |  | ||||||
|     } |  | ||||||
|     switch (attr) { |     switch (attr) { | ||||||
|     case IR::Attribute::Layer: |     case IR::Attribute::Layer: | ||||||
|         if (ctx.stage != Stage::Geometry && |         if (ctx.stage != Stage::Geometry && | ||||||
| @@ -312,33 +275,6 @@ void EmitSetAttribute(EmitContext& ctx, IR::Attribute attr, std::string_view val | |||||||
|     case IR::Attribute::PositionW: |     case IR::Attribute::PositionW: | ||||||
|         ctx.Add("gl_Position.{}={};", swizzle, value); |         ctx.Add("gl_Position.{}={};", swizzle, value); | ||||||
|         break; |         break; | ||||||
|     case IR::Attribute::ColorFrontDiffuseR: |  | ||||||
|     case IR::Attribute::ColorFrontDiffuseG: |  | ||||||
|     case IR::Attribute::ColorFrontDiffuseB: |  | ||||||
|     case IR::Attribute::ColorFrontDiffuseA: |  | ||||||
|         ctx.Add("gl_FrontColor.{}={};", swizzle, value); |  | ||||||
|         break; |  | ||||||
|     case IR::Attribute::ColorFrontSpecularR: |  | ||||||
|     case IR::Attribute::ColorFrontSpecularG: |  | ||||||
|     case IR::Attribute::ColorFrontSpecularB: |  | ||||||
|     case IR::Attribute::ColorFrontSpecularA: |  | ||||||
|         ctx.Add("gl_FrontSecondaryColor.{}={};", swizzle, value); |  | ||||||
|         break; |  | ||||||
|     case IR::Attribute::ColorBackDiffuseR: |  | ||||||
|     case IR::Attribute::ColorBackDiffuseG: |  | ||||||
|     case IR::Attribute::ColorBackDiffuseB: |  | ||||||
|     case IR::Attribute::ColorBackDiffuseA: |  | ||||||
|         ctx.Add("gl_BackColor.{}={};", swizzle, value); |  | ||||||
|         break; |  | ||||||
|     case IR::Attribute::ColorBackSpecularR: |  | ||||||
|     case IR::Attribute::ColorBackSpecularG: |  | ||||||
|     case IR::Attribute::ColorBackSpecularB: |  | ||||||
|     case IR::Attribute::ColorBackSpecularA: |  | ||||||
|         ctx.Add("gl_BackSecondaryColor.{}={};", swizzle, value); |  | ||||||
|         break; |  | ||||||
|     case IR::Attribute::FogCoordinate: |  | ||||||
|         ctx.Add("gl_FogFragCoord={};", value); |  | ||||||
|         break; |  | ||||||
|     case IR::Attribute::ClipDistance0: |     case IR::Attribute::ClipDistance0: | ||||||
|     case IR::Attribute::ClipDistance1: |     case IR::Attribute::ClipDistance1: | ||||||
|     case IR::Attribute::ClipDistance2: |     case IR::Attribute::ClipDistance2: | ||||||
|   | |||||||
| @@ -211,27 +211,6 @@ std::string_view OutputPrimitive(OutputTopology topology) { | |||||||
|     throw InvalidArgument("Invalid output topology {}", topology); |     throw InvalidArgument("Invalid output topology {}", topology); | ||||||
| } | } | ||||||
|  |  | ||||||
| void SetupLegacyOutPerVertex(EmitContext& ctx, std::string& header) { |  | ||||||
|     if (!ctx.info.stores.Legacy()) { |  | ||||||
|         return; |  | ||||||
|     } |  | ||||||
|     if (ctx.info.stores.FixedFunctionTexture()) { |  | ||||||
|         header += "vec4 gl_TexCoord[8];"; |  | ||||||
|     } |  | ||||||
|     if (ctx.info.stores.AnyComponent(IR::Attribute::ColorFrontDiffuseR)) { |  | ||||||
|         header += "vec4 gl_FrontColor;"; |  | ||||||
|     } |  | ||||||
|     if (ctx.info.stores.AnyComponent(IR::Attribute::ColorFrontSpecularR)) { |  | ||||||
|         header += "vec4 gl_FrontSecondaryColor;"; |  | ||||||
|     } |  | ||||||
|     if (ctx.info.stores.AnyComponent(IR::Attribute::ColorBackDiffuseR)) { |  | ||||||
|         header += "vec4 gl_BackColor;"; |  | ||||||
|     } |  | ||||||
|     if (ctx.info.stores.AnyComponent(IR::Attribute::ColorBackSpecularR)) { |  | ||||||
|         header += "vec4 gl_BackSecondaryColor;"; |  | ||||||
|     } |  | ||||||
| } |  | ||||||
|  |  | ||||||
| void SetupOutPerVertex(EmitContext& ctx, std::string& header) { | void SetupOutPerVertex(EmitContext& ctx, std::string& header) { | ||||||
|     if (!StoresPerVertexAttributes(ctx.stage)) { |     if (!StoresPerVertexAttributes(ctx.stage)) { | ||||||
|         return; |         return; | ||||||
| @@ -250,7 +229,6 @@ void SetupOutPerVertex(EmitContext& ctx, std::string& header) { | |||||||
|         ctx.profile.support_viewport_index_layer_non_geometry && ctx.stage != Stage::Geometry) { |         ctx.profile.support_viewport_index_layer_non_geometry && ctx.stage != Stage::Geometry) { | ||||||
|         header += "int gl_ViewportIndex;"; |         header += "int gl_ViewportIndex;"; | ||||||
|     } |     } | ||||||
|     SetupLegacyOutPerVertex(ctx, header); |  | ||||||
|     header += "};"; |     header += "};"; | ||||||
|     if (ctx.info.stores[IR::Attribute::ViewportIndex] && ctx.stage == Stage::Geometry) { |     if (ctx.info.stores[IR::Attribute::ViewportIndex] && ctx.stage == Stage::Geometry) { | ||||||
|         header += "out int gl_ViewportIndex;"; |         header += "out int gl_ViewportIndex;"; | ||||||
| @@ -282,21 +260,6 @@ void SetupInPerVertex(EmitContext& ctx, std::string& header) { | |||||||
|     } |     } | ||||||
|     header += "}gl_in[gl_MaxPatchVertices];"; |     header += "}gl_in[gl_MaxPatchVertices];"; | ||||||
| } | } | ||||||
|  |  | ||||||
| void SetupLegacyInPerFragment(EmitContext& ctx, std::string& header) { |  | ||||||
|     if (!ctx.info.loads.Legacy()) { |  | ||||||
|         return; |  | ||||||
|     } |  | ||||||
|     header += "in gl_PerFragment{"; |  | ||||||
|     if (ctx.info.loads.FixedFunctionTexture()) { |  | ||||||
|         header += "vec4 gl_TexCoord[8];"; |  | ||||||
|     } |  | ||||||
|     if (ctx.info.loads.AnyComponent(IR::Attribute::ColorFrontDiffuseR)) { |  | ||||||
|         header += "vec4 gl_Color;"; |  | ||||||
|     } |  | ||||||
|     header += "};"; |  | ||||||
| } |  | ||||||
|  |  | ||||||
| } // Anonymous namespace | } // Anonymous namespace | ||||||
|  |  | ||||||
| EmitContext::EmitContext(IR::Program& program, Bindings& bindings, const Profile& profile_, | EmitContext::EmitContext(IR::Program& program, Bindings& bindings, const Profile& profile_, | ||||||
| @@ -361,7 +324,6 @@ EmitContext::EmitContext(IR::Program& program, Bindings& bindings, const Profile | |||||||
|     } |     } | ||||||
|     SetupOutPerVertex(*this, header); |     SetupOutPerVertex(*this, header); | ||||||
|     SetupInPerVertex(*this, header); |     SetupInPerVertex(*this, header); | ||||||
|     SetupLegacyInPerFragment(*this, header); |  | ||||||
|  |  | ||||||
|     for (size_t index = 0; index < IR::NUM_GENERICS; ++index) { |     for (size_t index = 0; index < IR::NUM_GENERICS; ++index) { | ||||||
|         if (!info.loads.Generic(index) || !runtime_info.previous_stage_stores.Generic(index)) { |         if (!info.loads.Generic(index) || !runtime_info.previous_stage_stores.Generic(index)) { | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user