Hash :
5dd05578
Author :
Date :
2025-04-14T07:34:57
Revert "GL: Allow untranslated shaders to pass through on GLES" This reverts commit 4e77552b86a89b449ada6d6c18f84285f5812b1d. Reason for revert: breaks ChromeOS and fuzzers Bug: angleproject:398857482 Original change's description: > GL: Allow untranslated shaders to pass through on GLES > > Add an EGL extension EGL_ANGLE_create_context_passthrough_shaders which > uses the NULL translator and passes the original shader to the driver. > The parser is still used for shader reflection. > > Bug: angleproject:398857482 > Change-Id: I7c5fcc318c7e11931f78c08dcbf4764bf77d397d > Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/6297527 > Reviewed-by: Shahbaz Youssefi <syoussefi@chromium.org> > Commit-Queue: Geoff Lang <geofflang@chromium.org> Bug: angleproject:398857482, angleproject:410423936 Bug: chromium:410114655, chromium:410100607, chromium:410121218 Bug: chromium:410052365, chromium:410290507, chromium:410178288 No-Presubmit: true Change-Id: I45b01960637a1cda05d21a7df6d07465f6a8f5e9 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/6448984 Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com> Auto-Submit: Yuly Novikov <ynovikov@chromium.org> Commit-Queue: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com> Commit-Queue: Yuly Novikov <ynovikov@chromium.org>
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114
//
// Copyright 2022 The ANGLE Project Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
//
// CompiledShaderState.h:
// Defines a struct containing any data that is needed to build
// a CompiledShaderState from a TCompiler.
//
#ifndef COMMON_COMPILEDSHADERSTATE_H_
#define COMMON_COMPILEDSHADERSTATE_H_
#include "common/BinaryStream.h"
#include "common/Optional.h"
#include "common/PackedEnums.h"
#include <GLSLANG/ShaderLang.h>
#include <GLSLANG/ShaderVars.h>
#include <memory>
#include <string>
namespace sh
{
struct BlockMemberInfo;
using CompilerMetadataFlags = angle::PackedEnumBitSet<sh::MetadataFlags, uint32_t>;
} // namespace sh
namespace gl
{
// @todo this type is also defined in compiler/Compiler.h and libANGLE/renderer_utils.h. Move this
// to a single common definition?
using SpecConstUsageBits = angle::PackedEnumBitSet<sh::vk::SpecConstUsage, uint32_t>;
// Helper functions for serializing shader variables
void WriteShaderVar(gl::BinaryOutputStream *stream, const sh::ShaderVariable &var);
void LoadShaderVar(gl::BinaryInputStream *stream, sh::ShaderVariable *var);
void WriteShInterfaceBlock(gl::BinaryOutputStream *stream, const sh::InterfaceBlock &block);
void LoadShInterfaceBlock(gl::BinaryInputStream *stream, sh::InterfaceBlock *block);
bool CompareShaderVar(const sh::ShaderVariable &x, const sh::ShaderVariable &y);
struct CompiledShaderState
{
CompiledShaderState(gl::ShaderType shaderType);
~CompiledShaderState();
void buildCompiledShaderState(const ShHandle compilerHandle, const bool isBinaryOutput);
void serialize(gl::BinaryOutputStream &stream) const;
void deserialize(gl::BinaryInputStream &stream);
bool hasValidGeometryShaderInputPrimitiveType() const
{
return metadataFlags[sh::MetadataFlags::HasValidGeometryShaderInputPrimitiveType];
}
bool hasValidGeometryShaderOutputPrimitiveType() const
{
return metadataFlags[sh::MetadataFlags::HasValidGeometryShaderOutputPrimitiveType];
}
bool hasValidGeometryShaderMaxVertices() const
{
return metadataFlags[sh::MetadataFlags::HasValidGeometryShaderMaxVertices];
}
const gl::ShaderType shaderType;
int shaderVersion;
std::string translatedSource;
sh::BinaryBlob compiledBinary;
sh::WorkGroupSize localSize;
std::vector<sh::ShaderVariable> inputVaryings;
std::vector<sh::ShaderVariable> outputVaryings;
std::vector<sh::ShaderVariable> uniforms;
std::vector<sh::InterfaceBlock> uniformBlocks;
std::vector<sh::InterfaceBlock> shaderStorageBlocks;
std::vector<sh::ShaderVariable> allAttributes;
std::vector<sh::ShaderVariable> activeAttributes;
std::vector<sh::ShaderVariable> activeOutputVariables;
sh::CompilerMetadataFlags metadataFlags;
gl::BlendEquationBitSet advancedBlendEquations;
SpecConstUsageBits specConstUsageBits;
// GL_OVR_multiview / GL_OVR_multiview2
int numViews;
// Geometry Shader
gl::PrimitiveMode geometryShaderInputPrimitiveType;
gl::PrimitiveMode geometryShaderOutputPrimitiveType;
GLint geometryShaderMaxVertices;
int geometryShaderInvocations;
// Tessellation Shader
int tessControlShaderVertices;
GLenum tessGenMode;
GLenum tessGenSpacing;
GLenum tessGenVertexOrder;
GLenum tessGenPointMode;
// ANGLE_shader_pixel_local_storage: A mapping from binding index to the PLS uniform format at
// that index.
std::vector<ShPixelLocalStorageFormat> pixelLocalStorageFormats;
};
using SharedCompiledShaderState = std::shared_ptr<CompiledShaderState>;
} // namespace gl
#endif // COMMON_COMPILEDSHADERSTATE_H_