Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2750)

Unified Diff: gpu/command_buffer/service/program_manager.h

Issue 159183002: Revert 250146 "Merge 249460 "Hookup clear_uniforms_before_first_..." (Closed) Base URL: svn://svn.chromium.org/chrome/branches/1750/src/
Patch Set: Created 6 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: gpu/command_buffer/service/program_manager.h
===================================================================
--- gpu/command_buffer/service/program_manager.h (revision 250177)
+++ gpu/command_buffer/service/program_manager.h (working copy)
@@ -20,6 +20,7 @@
namespace gpu {
namespace gles2 {
+class FeatureInfo;
class ProgramCache;
class ProgramManager;
class Shader;
@@ -156,6 +157,7 @@
bool Link(ShaderManager* manager,
ShaderTranslator* vertex_translator,
ShaderTranslator* fragment_shader,
+ FeatureInfo* feature_info,
const ShaderCacheCallback& shader_callback);
// Performs glValidateProgram and related activities.
@@ -334,11 +336,6 @@
// need to be shared by multiple GLES2Decoders.
class GPU_EXPORT ProgramManager {
public:
- enum TranslatedShaderSourceType {
- kANGLE,
- kGL, // GL or GLES
- };
-
explicit ProgramManager(ProgramCache* program_cache,
uint32 max_varying_vectors);
~ProgramManager();
@@ -378,10 +375,9 @@
static int32 MakeFakeLocation(int32 index, int32 element);
- void DoCompileShader(
- Shader* shader,
- ShaderTranslator* translator,
- TranslatedShaderSourceType translated_shader_source_type);
+ void DoCompileShader(Shader* shader,
+ ShaderTranslator* translator,
+ FeatureInfo* feature_info);
uint32 max_varying_vectors() const {
return max_varying_vectors_;
@@ -407,6 +403,8 @@
bool have_context_;
+ bool disable_workarounds_;
+
// Used to clear uniforms.
std::vector<uint8> zero_;
« no previous file with comments | « gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.cc ('k') | gpu/command_buffer/service/program_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698