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

Unified Diff: components/display_compositor/buffer_queue.cc

Issue 2089753003: cc: Use the correct internal format for glCopyTexImage2D calls. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: copytextureformat: bufferqueue Created 4 years, 6 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: components/display_compositor/buffer_queue.cc
diff --git a/components/display_compositor/buffer_queue.cc b/components/display_compositor/buffer_queue.cc
index 8649d101023ec8abf9c9c82883a795afbbeeb24c..be5840706a2e9328b16b0125c80e9f01f1b12f79 100644
--- a/components/display_compositor/buffer_queue.cc
+++ b/components/display_compositor/buffer_queue.cc
@@ -20,8 +20,8 @@
namespace display_compositor {
BufferQueue::BufferQueue(gpu::gles2::GLES2Interface* gl,
- unsigned int texture_target,
- unsigned int internalformat,
+ uint32_t texture_target,
+ uint32_t internal_format,
GLHelper* gl_helper,
gpu::GpuMemoryBufferManager* gpu_memory_buffer_manager,
gpu::SurfaceHandle surface_handle)
@@ -29,7 +29,7 @@ BufferQueue::BufferQueue(gpu::gles2::GLES2Interface* gl,
fbo_(0),
allocated_count_(0),
texture_target_(texture_target),
- internal_format_(internalformat),
+ internal_format_(internal_format),
gl_helper_(gl_helper),
gpu_memory_buffer_manager_(gpu_memory_buffer_manager),
surface_handle_(surface_handle) {}
@@ -83,7 +83,7 @@ void BufferQueue::SwapBuffers(const gfx::Rect& damage) {
// Copy damage from the most recently swapped buffer. In the event that
// the buffer was destroyed and failed to recreate, pick from the most
// recently available buffer.
- unsigned int texture_id = 0;
+ uint32_t texture_id = 0;
for (auto& surface : base::Reversed(in_flight_surfaces_)) {
if (surface) {
texture_id = surface->texture;
@@ -219,7 +219,7 @@ std::unique_ptr<BufferQueue::AllocatedSurface> BufferQueue::GetNextSurface() {
return nullptr;
}
- unsigned int id =
+ uint32_t id =
gl_->CreateImageCHROMIUM(buffer->AsClientBuffer(), size_.width(),
size_.height(), internal_format_);
if (!id) {
@@ -238,8 +238,8 @@ std::unique_ptr<BufferQueue::AllocatedSurface> BufferQueue::GetNextSurface() {
BufferQueue::AllocatedSurface::AllocatedSurface(
BufferQueue* buffer_queue,
std::unique_ptr<gfx::GpuMemoryBuffer> buffer,
- unsigned int texture,
- unsigned int image,
+ uint32_t texture,
+ uint32_t image,
const gfx::Rect& rect)
: buffer_queue(buffer_queue),
buffer(buffer.release()),

Powered by Google App Engine
This is Rietveld 408576698