Rename Symbol SDF shader (#3473)
This commit is contained in:
@@ -220,7 +220,7 @@ struct ShaderInfo<BuiltIn::SymbolIconShader, gfx::Backend::Type::OpenGL> {
|
||||
};
|
||||
|
||||
template <>
|
||||
struct ShaderInfo<BuiltIn::SymbolSDFIconShader, gfx::Backend::Type::OpenGL> {
|
||||
struct ShaderInfo<BuiltIn::SymbolSDFShader, gfx::Backend::Type::OpenGL> {
|
||||
static const std::vector<AttributeInfo> attributes;
|
||||
static const std::vector<UniformBlockInfo> uniformBlocks;
|
||||
static const std::vector<TextureInfo> textures;
|
||||
|
||||
@@ -6,8 +6,8 @@ namespace mbgl {
|
||||
namespace shaders {
|
||||
|
||||
template <>
|
||||
struct ShaderSource<BuiltIn::SymbolSDFIconShader, gfx::Backend::Type::OpenGL> {
|
||||
static constexpr const char* name = "SymbolSDFIconShader";
|
||||
struct ShaderSource<BuiltIn::SymbolSDFShader, gfx::Backend::Type::OpenGL> {
|
||||
static constexpr const char* name = "SymbolSDFShader";
|
||||
static constexpr const char* vertex = R"(layout (location = 0) in vec4 a_pos_offset;
|
||||
layout (location = 1) in vec4 a_data;
|
||||
layout (location = 2) in vec4 a_pixeloffset;
|
||||
|
||||
@@ -211,8 +211,8 @@ half4 fragment fragmentMain(FragmentStage in [[stage_in]],
|
||||
};
|
||||
|
||||
template <>
|
||||
struct ShaderSource<BuiltIn::SymbolSDFIconShader, gfx::Backend::Type::Metal> {
|
||||
static constexpr auto name = "SymbolSDFIconShader";
|
||||
struct ShaderSource<BuiltIn::SymbolSDFShader, gfx::Backend::Type::Metal> {
|
||||
static constexpr auto name = "SymbolSDFShader";
|
||||
static constexpr auto vertexMainFunction = "vertexMain";
|
||||
static constexpr auto fragmentMainFunction = "fragmentMain";
|
||||
|
||||
|
||||
@@ -38,7 +38,7 @@ enum class BuiltIn {
|
||||
LineSDFShader,
|
||||
RasterShader,
|
||||
SymbolIconShader,
|
||||
SymbolSDFIconShader,
|
||||
SymbolSDFShader,
|
||||
SymbolTextAndIconShader,
|
||||
WideVectorShader
|
||||
};
|
||||
|
||||
@@ -203,8 +203,8 @@ void main() {
|
||||
};
|
||||
|
||||
template <>
|
||||
struct ShaderSource<BuiltIn::SymbolSDFIconShader, gfx::Backend::Type::Vulkan> {
|
||||
static constexpr const char* name = "SymbolSDFIconShader";
|
||||
struct ShaderSource<BuiltIn::SymbolSDFShader, gfx::Backend::Type::Vulkan> {
|
||||
static constexpr const char* name = "SymbolSDFShader";
|
||||
|
||||
static const std::array<AttributeInfo, 10> attributes;
|
||||
static constexpr std::array<AttributeInfo, 0> instanceAttributes{};
|
||||
|
||||
Reference in New Issue
Block a user