Index: gpu/command_buffer/service/gles2_cmd_apply_framebuffer_attachment_cmaa_intel.h |
diff --git a/gpu/command_buffer/service/gles2_cmd_apply_framebuffer_attachment_cmaa_intel.h b/gpu/command_buffer/service/gles2_cmd_apply_framebuffer_attachment_cmaa_intel.h |
index 7f98fbc72ed85ac71fadc7f502ccc49203ba5a54..1d1e530e1428f20cd2f3035bf960b4689f204a47 100644 |
--- a/gpu/command_buffer/service/gles2_cmd_apply_framebuffer_attachment_cmaa_intel.h |
+++ b/gpu/command_buffer/service/gles2_cmd_apply_framebuffer_attachment_cmaa_intel.h |
@@ -39,12 +39,14 @@ class GPU_EXPORT ApplyFramebufferAttachmentCMAAINTELResourceManager { |
private: |
// Applies the CMAA algorithm to a texture. |
- void ApplyCMAAEffectTexture(GLuint source_texture, GLuint dest_texture); |
+ void ApplyCMAAEffectTexture(GLuint source_texture, |
+ GLuint dest_texture, |
+ bool do_copy); |
void OnSize(GLint width, GLint height); |
void ReleaseTextures(); |
- void CopyTexture(GLint source, GLint dest, bool via_fbo); |
+ void CopyTexture(GLint source, GLint dest); |
GLuint CreateProgram(const char* defines, |
const char* vs_source, |
const char* fs_source); |
@@ -64,7 +66,6 @@ class GPU_EXPORT ApplyFramebufferAttachmentCMAAINTELResourceManager { |
GLint height_; |
GLuint copy_to_framebuffer_shader_; |
- GLuint copy_to_image_shader_; |
GLuint edges0_shader_; |
GLuint edges1_shader_; |
GLuint edges_combine_shader_; |
@@ -81,12 +82,11 @@ class GPU_EXPORT ApplyFramebufferAttachmentCMAAINTELResourceManager { |
GLuint mini4_edge_texture_; |
GLuint mini4_edge_depth_texture_; |
- GLuint edges1_shader_result_texture_float4_slot1_; |
- GLuint edges1_shader_result_texture_; |
- GLuint edges_combine_shader_result_texture_float4_slot1_; |
- GLuint process_and_apply_shader_result_texture_float4_slot1_; |
- GLuint edges_combine_shader_result_texture_slot2_; |
- GLuint copy_to_image_shader_outTexture_; |
+ GLuint edges0_shader_result_rgba_texture_slot1_; |
+ GLuint edges0_shader_target_texture_slot2_; |
+ GLuint edges1_shader_result_edge_texture_; |
+ GLuint process_and_apply_shader_result_rgba_texture_slot1_; |
+ GLuint edges_combine_shader_result_edge_texture_; |
static const char vert_str_[]; |
static const char cmaa_frag_s1_[]; |