gpu/command_buffer/service/gles2_cmd_decoder.cc - Issue 1263043006: Implement the texture uploading of ASTC compression for WebGL

Unified Diff: gpu/command_buffer/service/gles2_cmd_decoder.cc

Issue 1263043006: Implement the texture uploading of ASTC compression for WebGL (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Remove unnecerssary code and cleanup. Created 5 years, 4 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

« no previous file with comments | « gpu/command_buffer/service/feature_info.cc ('k') | gpu/command_buffer/service/gles2_cmd_decoder_unittest_textures.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: gpu/command_buffer/service/gles2_cmd_decoder.cc

diff --git a/gpu/command_buffer/service/gles2_cmd_decoder.cc b/gpu/command_buffer/service/gles2_cmd_decoder.cc

index 82e9052c63b7cc621771c35f4c0442676194ed3a..a237242d263f9575d1461f1f5b57e327b2f6ba6c 100644

--- a/gpu/command_buffer/service/gles2_cmd_decoder.cc

+++ b/gpu/command_buffer/service/gles2_cmd_decoder.cc

@@ -3165,6 +3165,8 @@ Capabilities GLES2DecoderImpl::GetCapabilities() {

caps.egl_image_external =

feature_info_->feature_flags().oes_egl_image_external;

+ caps.texture_format_astc =

+ feature_info_->feature_flags().ext_texture_format_astc;

caps.texture_format_atc =

feature_info_->feature_flags().ext_texture_format_atc;

caps.texture_format_bgra8888 =

@@ -6937,7 +6939,6 @@ bool GLES2DecoderImpl::PrepareTexturesForRender() {

!texture_manager()->HaveImages()) {

return true;

}

bool textures_set = false;

const Program::SamplerIndices& sampler_indices =

state_.current_program->sampler_indices();

@@ -9214,12 +9215,37 @@ bool GLES2DecoderImpl::ClearLevel(Texture* texture,

namespace {

+const int kASTCBlockSize = 16;

const int kS3TCBlockWidth = 4;

const int kS3TCBlockHeight = 4;

const int kS3TCDXT1BlockSize = 8;

const int kS3TCDXT3AndDXT5BlockSize = 16;

const int kEACAndETC2BlockSize = 4;

+typedef struct {

+ int blockWidth;

+ int blockHeight;

+} ASTCBlockArray;

+const ASTCBlockArray kASTCBlockArray[] =

+ {

Zhenyao Mo 2015/08/25 14:15:16 nit: this is against code style. see https://goog

+ 4, 4, /* GL_COMPRESSED_RGBA_ASTC_4x4_KHR */

+ 5, 4, /* and GL_COMPRESSED_SRGB8_ALPHA8_ASTC_4x4_KHR */

+ 5, 5,

+ 6, 5,

+ 6, 6,

+ 8, 5,

+ 8, 6,

+ 8, 8,

+ 10, 5,

+ 10, 6,

+ 10, 8,

+ 10, 10,

+ 12, 10,

+ 12, 12,

+ };

bool IsValidDXTSize(GLint level, GLsizei size) {

return (size == 1) ||

(size == 2) || !(size % kS3TCBlockWidth);

@@ -9247,6 +9273,49 @@ bool GLES2DecoderImpl::GetCompressedTexSizeInBytes(

(height + kS3TCBlockHeight - 1) / kS3TCBlockHeight;

bytes_required *= kS3TCDXT1BlockSize;

break;

+ case GL_COMPRESSED_RGBA_ASTC_4x4_KHR:

+ case GL_COMPRESSED_RGBA_ASTC_5x4_KHR:

+ case GL_COMPRESSED_RGBA_ASTC_5x5_KHR:

+ case GL_COMPRESSED_RGBA_ASTC_6x5_KHR:

+ case GL_COMPRESSED_RGBA_ASTC_6x6_KHR:

+ case GL_COMPRESSED_RGBA_ASTC_8x5_KHR:

+ case GL_COMPRESSED_RGBA_ASTC_8x6_KHR:

+ case GL_COMPRESSED_RGBA_ASTC_8x8_KHR:

+ case GL_COMPRESSED_RGBA_ASTC_10x5_KHR:

+ case GL_COMPRESSED_RGBA_ASTC_10x6_KHR:

+ case GL_COMPRESSED_RGBA_ASTC_10x8_KHR:

+ case GL_COMPRESSED_RGBA_ASTC_10x10_KHR:

+ case GL_COMPRESSED_RGBA_ASTC_12x10_KHR:

+ case GL_COMPRESSED_RGBA_ASTC_12x12_KHR:

+ case GL_COMPRESSED_SRGB8_ALPHA8_ASTC_4x4_KHR:

+ case GL_COMPRESSED_SRGB8_ALPHA8_ASTC_5x4_KHR:

+ case GL_COMPRESSED_SRGB8_ALPHA8_ASTC_5x5_KHR:

+ case GL_COMPRESSED_SRGB8_ALPHA8_ASTC_6x5_KHR:

+ case GL_COMPRESSED_SRGB8_ALPHA8_ASTC_6x6_KHR:

+ case GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x5_KHR:

+ case GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x6_KHR:

+ case GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x8_KHR:

+ case GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x5_KHR:

+ case GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x6_KHR:

+ case GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x8_KHR:

+ case GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x10_KHR:

+ case GL_COMPRESSED_SRGB8_ALPHA8_ASTC_12x10_KHR:

+ case GL_COMPRESSED_SRGB8_ALPHA8_ASTC_12x12_KHR: {

+ const int index = (format < GL_COMPRESSED_SRGB8_ALPHA8_ASTC_4x4_KHR) ?

+ static_cast<int>(format - GL_COMPRESSED_RGBA_ASTC_4x4_KHR) :

Zhenyao Mo 2015/08/25 14:15:16 nit: 4 space indent here and next line

+ static_cast<int>(format - GL_COMPRESSED_SRGB8_ALPHA8_ASTC_4x4_KHR);

+ const int kBlockWidth = kASTCBlockArray[index].blockWidth;

+ const int kBlockHeight = kASTCBlockArray[index].blockHeight;

+ bytes_required =

+ (width + kBlockWidth - 1) / kBlockWidth;

+ bytes_required *=

+ (height + kBlockHeight - 1) / kBlockHeight;

+ bytes_required *= kASTCBlockSize;

+ break;

+ }

case GL_ATC_RGBA_EXPLICIT_ALPHA_AMD:

case GL_ATC_RGBA_INTERPOLATED_ALPHA_AMD:

case GL_COMPRESSED_RGBA_S3TC_DXT3_EXT:

@@ -9347,6 +9416,34 @@ bool GLES2DecoderImpl::ValidateCompressedTexDimensions(

return false;

}