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

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

Issue 1309743005: command_buffer: Implement EXT_blend_func_extended (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@new-05-path-fragment-input-gen
Patch Set: address review comments Created 5 years, 3 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/test_helper.h
diff --git a/gpu/command_buffer/service/test_helper.h b/gpu/command_buffer/service/test_helper.h
index 45297ee81f189c59eca77c6f2702f017f43a5166..4e8fcd6e73bf319f55ae927ad410fbda82c48d27 100644
--- a/gpu/command_buffer/service/test_helper.h
+++ b/gpu/command_buffer/service/test_helper.h
@@ -82,6 +82,13 @@ class TestHelper {
GLint real_location;
GLint desired_location;
};
+ struct ProgramOutputInfo {
+ const char* name;
+ GLint size;
+ GLenum type;
+ GLint color_name;
+ GLuint index;
+ };
static void SetupContextGroupInitExpectations(
::gfx::MockGLInterface* gl,
@@ -126,17 +133,22 @@ class TestHelper {
size_t num_uniforms,
VaryingInfo* varyings,
size_t num_varyings,
+ ProgramOutputInfo* program_outputs,
+ size_t num_program_outputs,
GLuint service_id);
- static void SetupProgramSuccessExpectations(::gfx::MockGLInterface* gl,
- const FeatureInfo* feature_info,
- AttribInfo* attribs,
- size_t num_attribs,
- UniformInfo* uniforms,
- size_t num_uniforms,
- VaryingInfo* varyings,
- size_t num_varyings,
- GLuint service_id);
+ static void SetupProgramSuccessExpectations(
+ ::gfx::MockGLInterface* gl,
+ const FeatureInfo* feature_info,
+ AttribInfo* attribs,
+ size_t num_attribs,
+ UniformInfo* uniforms,
+ size_t num_uniforms,
+ VaryingInfo* varyings,
+ size_t num_varyings,
+ ProgramOutputInfo* program_outputs,
+ size_t num_program_outputs,
+ GLuint service_id);
static void DoBufferData(
::gfx::MockGLInterface* gl, MockErrorState* error_state,
@@ -149,7 +161,8 @@ class TestHelper {
GLenum pname, GLint value, GLenum error);
static void SetShaderStates(
- ::gfx::MockGLInterface* gl, Shader* shader,
+ ::gfx::MockGLInterface* gl,
+ Shader* shader,
bool expected_valid,
const std::string* const expected_log_info,
const std::string* const expected_translated_source,
@@ -157,6 +170,7 @@ class TestHelper {
const AttributeMap* const expected_attrib_map,
const UniformMap* const expected_uniform_map,
const VaryingMap* const expected_varying_map,
+ const OutputVariableList* const expected_output_variable_list,
const NameMap* const expected_name_map);
static void SetShaderStates(
@@ -171,6 +185,11 @@ class TestHelper {
static sh::Varying ConstructVarying(
GLenum type, GLint array_size, GLenum precision,
bool static_use, const std::string& name);
+ static sh::OutputVariable ConstructOutputVariable(GLenum type,
+ GLint array_size,
+ GLenum precision,
+ bool static_use,
+ const std::string& name);
private:
static void SetupTextureInitializationExpectations(::gfx::MockGLInterface* gl,

Powered by Google App Engine
This is Rietveld 408576698