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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ui/gl/gl_image_memory.cc

Issue 793693003: Tile Compression (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years 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 | « ui/gl/gl_image_memory.h ('k') | ui/gl/gl_image_shared_memory.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/gl/gl_image_memory.cc
diff --git a/ui/gl/gl_image_memory.cc b/ui/gl/gl_image_memory.cc
index 0a67e000665b6a5806a0f935f61e02faaf540a15..1fa88f2c4053a8e37138222c0a8d3d39767956cb 100644
--- a/ui/gl/gl_image_memory.cc
+++ b/ui/gl/gl_image_memory.cc
@@ -30,6 +30,11 @@ bool ValidFormat(gfx::GpuMemoryBuffer::Format format) {
switch (format) {
case gfx::GpuMemoryBuffer::RGBA_8888:
case gfx::GpuMemoryBuffer::BGRA_8888:
+ case gfx::GpuMemoryBuffer::ATC:
+ case gfx::GpuMemoryBuffer::ATCIA:
+ case gfx::GpuMemoryBuffer::DXT1:
+ case gfx::GpuMemoryBuffer::DXT5:
+ case gfx::GpuMemoryBuffer::ETC1:
return true;
case gfx::GpuMemoryBuffer::RGBX_8888:
return false;
@@ -39,6 +44,24 @@ bool ValidFormat(gfx::GpuMemoryBuffer::Format format) {
return false;
}
+bool CompressedFormat(gfx::GpuMemoryBuffer::Format format) {
+ switch (format) {
+ case gfx::GpuMemoryBuffer::ATC:
+ case gfx::GpuMemoryBuffer::ATCIA:
+ case gfx::GpuMemoryBuffer::DXT1:
+ case gfx::GpuMemoryBuffer::DXT5:
+ case gfx::GpuMemoryBuffer::ETC1:
+ return true;
+ case gfx::GpuMemoryBuffer::RGBA_8888:
+ case gfx::GpuMemoryBuffer::BGRA_8888:
+ case gfx::GpuMemoryBuffer::RGBX_8888:
+ return false;
+ }
+
+ NOTREACHED();
+ return false;
+}
+
GLenum TextureFormat(gfx::GpuMemoryBuffer::Format format) {
switch (format) {
case gfx::GpuMemoryBuffer::RGBA_8888:
@@ -48,6 +71,16 @@ GLenum TextureFormat(gfx::GpuMemoryBuffer::Format format) {
case gfx::GpuMemoryBuffer::RGBX_8888:
NOTREACHED();
return 0;
+ case gfx::GpuMemoryBuffer::ATC:
+ return GL_ATC_RGB_AMD;
+ case gfx::GpuMemoryBuffer::ATCIA:
+ return GL_ATC_RGBA_INTERPOLATED_ALPHA_AMD;
+ case gfx::GpuMemoryBuffer::DXT1:
+ return GL_COMPRESSED_RGB_S3TC_DXT1_EXT;
+ case gfx::GpuMemoryBuffer::DXT5:
+ return GL_COMPRESSED_RGBA_S3TC_DXT5_EXT;
+ case gfx::GpuMemoryBuffer::ETC1:
+ return GL_ETC1_RGB8_OES;
}
NOTREACHED();
@@ -64,6 +97,11 @@ GLenum DataType(gfx::GpuMemoryBuffer::Format format) {
case gfx::GpuMemoryBuffer::BGRA_8888:
return GL_UNSIGNED_BYTE;
case gfx::GpuMemoryBuffer::RGBX_8888:
+ case gfx::GpuMemoryBuffer::ATC:
+ case gfx::GpuMemoryBuffer::ATCIA:
+ case gfx::GpuMemoryBuffer::DXT1:
+ case gfx::GpuMemoryBuffer::DXT5:
+ case gfx::GpuMemoryBuffer::ETC1:
NOTREACHED();
return 0;
}
@@ -100,14 +138,21 @@ GLImageMemory::~GLImageMemory() {
}
// static
-size_t GLImageMemory::BytesPerPixel(gfx::GpuMemoryBuffer::Format format) {
+size_t GLImageMemory::BitsPerPixel(gfx::GpuMemoryBuffer::Format format) {
switch (format) {
case gfx::GpuMemoryBuffer::RGBA_8888:
case gfx::GpuMemoryBuffer::BGRA_8888:
- return 4;
+ return 32;
case gfx::GpuMemoryBuffer::RGBX_8888:
NOTREACHED();
return 0;
+ case gfx::GpuMemoryBuffer::ATCIA:
+ case gfx::GpuMemoryBuffer::DXT5:
+ return 8;
+ case gfx::GpuMemoryBuffer::ATC:
+ case gfx::GpuMemoryBuffer::DXT1:
+ case gfx::GpuMemoryBuffer::ETC1:
+ return 4;
}
NOTREACHED();
@@ -179,11 +224,22 @@ bool GLImageMemory::CopyTexImage(unsigned target) {
return false;
DCHECK(memory_);
- glTexSubImage2D(target, 0, // level
- 0, // x
- 0, // y
- size_.width(), size_.height(), DataFormat(format_),
- DataType(format_), memory_);
+
+ if (CompressedFormat(format_)) {
+ glCompressedTexSubImage2D(target,
+ 0, // mip level
+ 0, // x-offset
+ 0, // y-offset
+ size_.width(), size_.height(),
+ DataFormat(format_), MemoryBytes(format_),
+ memory_);
+ } else {
+ glTexSubImage2D(target, 0, // level
+ 0, // x
+ 0, // y
+ size_.width(), size_.height(), DataFormat(format_),
+ DataType(format_), memory_);
+ }
return true;
}
@@ -232,15 +288,21 @@ void GLImageMemory::DoBindTexImage(unsigned target) {
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
- glTexImage2D(GL_TEXTURE_2D,
- 0, // mip level
- TextureFormat(format_),
- size_.width(),
- size_.height(),
- 0, // border
- DataFormat(format_),
- DataType(format_),
- memory_);
+
+ if (CompressedFormat(format_)) {
+ glCompressedTexImage2D(GL_TEXTURE_2D,
+ 0, // mip level
+ TextureFormat(format_), size_.width(),
+ size_.height(),
+ 0, // border
+ MemoryBytes(format_), memory_);
+ } else {
+ glTexImage2D(GL_TEXTURE_2D,
+ 0, // mip level
+ TextureFormat(format_), size_.width(), size_.height(),
+ 0, // border
+ DataFormat(format_), DataType(format_), memory_);
+ }
}
EGLint attrs[] = {EGL_IMAGE_PRESERVED_KHR, EGL_TRUE, EGL_NONE};
@@ -257,15 +319,22 @@ void GLImageMemory::DoBindTexImage(unsigned target) {
} else {
ScopedTextureBinder texture_binder(GL_TEXTURE_2D, egl_texture_id_);
- glTexSubImage2D(GL_TEXTURE_2D,
- 0, // mip level
- 0, // x-offset
- 0, // y-offset
- size_.width(),
- size_.height(),
- DataFormat(format_),
- DataType(format_),
- memory_);
+ if (CompressedFormat(format_)) {
+ glCompressedTexSubImage2D(GL_TEXTURE_2D,
+ 0, // mip level
+ 0, // x-offset
+ 0, // y-offset
+ size_.width(), size_.height(),
+ DataFormat(format_), MemoryBytes(format_),
+ memory_);
+ } else {
+ glTexSubImage2D(GL_TEXTURE_2D,
+ 0, // mip level
+ 0, // x-offset
+ 0, // y-offset
+ size_.width(), size_.height(), DataFormat(format_),
+ DataType(format_), memory_);
+ }
}
glEGLImageTargetTexture2DOES(target, egl_image_);
@@ -275,15 +344,25 @@ void GLImageMemory::DoBindTexImage(unsigned target) {
#endif
DCHECK_NE(static_cast<GLenum>(GL_TEXTURE_EXTERNAL_OES), target);
- glTexImage2D(target,
- 0, // mip level
- TextureFormat(format_),
- size_.width(),
- size_.height(),
- 0, // border
- DataFormat(format_),
- DataType(format_),
- memory_);
+
+ if (CompressedFormat(format_)) {
+ glCompressedTexImage2D(target,
+ 0, // mip level
+ TextureFormat(format_), size_.width(),
+ size_.height(),
+ 0, // border
+ MemoryBytes(format_), memory_);
+ } else {
+ glTexImage2D(target,
+ 0, // mip level
+ TextureFormat(format_), size_.width(), size_.height(),
+ 0, // border
+ DataFormat(format_), DataType(format_), memory_);
+ }
+}
+
+size_t GLImageMemory::MemoryBytes(gfx::GpuMemoryBuffer::Format format) {
+ return BitsPerPixel(format_) * size_.width() * size_.height() / 8;
}
} // namespace gfx
« no previous file with comments | « ui/gl/gl_image_memory.h ('k') | ui/gl/gl_image_shared_memory.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698