Sign Up
Log In
Log In
or
Sign Up
Places
All Projects
Status Monitor
Collapse sidebar
home:zhmars:arch
chromium122
0001-230619-Eliminate-GLImage.patch
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File 0001-230619-Eliminate-GLImage.patch of Package chromium122
Index: chromium_vaapi/gpu/command_buffer/service/abstract_texture.h =================================================================== --- chromium_vaapi.orig/gpu/command_buffer/service/abstract_texture.h +++ chromium_vaapi/gpu/command_buffer/service/abstract_texture.h @@ -16,10 +16,11 @@ typedef int GLsizei; typedef int GLint; typedef unsigned int GLuint; -namespace gpu { - -class GLImageNativePixmap; +namespace gl { +class GLImage; +} // namespace gl +namespace gpu { namespace gles2 { // An AbstractTexture enables access to GL textures from the GPU process, for @@ -63,7 +64,7 @@ class GPU_GLES2_EXPORT AbstractTexture { // It is not required to SetCleared() if one binds an image. // // The context must be current. - virtual void SetBoundImage(GLImageNativePixmap* image) = 0; + virtual void SetBoundImage(gl::GLImage* image) = 0; #endif // Marks the texture as cleared, to help prevent sending an uninitialized Index: chromium_vaapi/gpu/command_buffer/service/gles2_cmd_decoder_unittest.cc =================================================================== --- chromium_vaapi.orig/gpu/command_buffer/service/gles2_cmd_decoder_unittest.cc +++ chromium_vaapi/gpu/command_buffer/service/gles2_cmd_decoder_unittest.cc @@ -274,7 +274,7 @@ TEST_P(GLES2DecoderTest, TestImageBindin 1, /* depth */ 0, /* border */ GL_RGBA, GL_UNSIGNED_BYTE); - scoped_refptr<GLImageNativePixmap> image( + scoped_refptr<gl::GLImage> image( GLImageNativePixmap::CreateForTesting(gfx::Size(256, 256))); abstract_texture->SetBoundImage(image.get()); @@ -316,7 +316,7 @@ TEST_P(GLES2DecoderTest, CreateAbstractT EXPECT_EQ(texture->min_filter(), static_cast<GLenum>(GL_LINEAR)); // Attach an image and see if it works. - scoped_refptr<GLImageNativePixmap> image( + scoped_refptr<gl::GLImage> image( GLImageNativePixmap::CreateForTesting(gfx::Size())); abstract_texture->SetBoundImage(image.get()); Index: chromium_vaapi/gpu/command_buffer/service/passthrough_abstract_texture_impl.cc =================================================================== --- chromium_vaapi.orig/gpu/command_buffer/service/passthrough_abstract_texture_impl.cc +++ chromium_vaapi/gpu/command_buffer/service/passthrough_abstract_texture_impl.cc @@ -48,7 +48,7 @@ void PassthroughAbstractTextureImpl::Set } #if BUILDFLAG(IS_OZONE) -void PassthroughAbstractTextureImpl::SetBoundImage(GLImageNativePixmap* image) { +void PassthroughAbstractTextureImpl::SetBoundImage(gl::GLImage* image) { if (!texture_passthrough_) { return; } Index: chromium_vaapi/gpu/command_buffer/service/passthrough_abstract_texture_impl.h =================================================================== --- chromium_vaapi.orig/gpu/command_buffer/service/passthrough_abstract_texture_impl.h +++ chromium_vaapi/gpu/command_buffer/service/passthrough_abstract_texture_impl.h @@ -32,7 +32,7 @@ class GPU_GLES2_EXPORT PassthroughAbstra TextureBase* GetTextureBase() const override; void SetParameteri(GLenum pname, GLint param) override; #if BUILDFLAG(IS_OZONE) - void SetBoundImage(GLImageNativePixmap* image) override; + void SetBoundImage(gl::GLImage* image) override; #endif void SetCleared() override; Index: chromium_vaapi/gpu/command_buffer/service/shared_image/gl_image_native_pixmap.h =================================================================== --- chromium_vaapi.orig/gpu/command_buffer/service/shared_image/gl_image_native_pixmap.h +++ chromium_vaapi/gpu/command_buffer/service/shared_image/gl_image_native_pixmap.h @@ -7,10 +7,10 @@ #include <stdint.h> -#include "base/memory/ref_counted.h" #include "gpu/gpu_gles2_export.h" #include "ui/gfx/native_pixmap.h" #include "ui/gl/gl_bindings.h" +#include "ui/gl/gl_image.h" namespace media { class V4L2SliceVideoDecodeAccelerator; @@ -24,11 +24,9 @@ namespace gpu { namespace gles2 { class GLES2DecoderImpl; -class GLES2DecoderPassthroughImpl; } -class GPU_GLES2_EXPORT GLImageNativePixmap - : public base::RefCounted<GLImageNativePixmap> { +class GPU_GLES2_EXPORT GLImageNativePixmap : public gl::GLImage { private: // Create an EGLImage from a given NativePixmap and bind |texture_id| to // |target| following by binding the image to |target|. @@ -63,12 +61,10 @@ class GPU_GLES2_EXPORT GLImageNativePixm private: friend class gles2::GLES2DecoderImpl; - friend class gles2::GLES2DecoderPassthroughImpl; friend class media::V4L2SliceVideoDecodeAccelerator; - friend class base::RefCounted<GLImageNativePixmap>; explicit GLImageNativePixmap(const gfx::Size& size); - ~GLImageNativePixmap(); + ~GLImageNativePixmap() override; // Create a NativePixmapGLBinding from a given NativePixmap. Returns true iff // the binding was successfully created. Index: chromium_vaapi/gpu/command_buffer/service/texture_manager.cc =================================================================== --- chromium_vaapi.orig/gpu/command_buffer/service/texture_manager.cc +++ chromium_vaapi/gpu/command_buffer/service/texture_manager.cc @@ -40,7 +40,7 @@ #include "ui/gl/trace_util.h" #if BUILDFLAG(IS_OZONE) -#include "gpu/command_buffer/service/shared_image/gl_image_native_pixmap.h" +#include "ui/gl/gl_image.h" #endif using base::trace_event::MemoryAllocatorDump; @@ -571,7 +571,7 @@ void TexturePassthrough::MarkContextLost #if BUILDFLAG(IS_OZONE) void TexturePassthrough::SetLevelImage(GLenum target, GLint level, - GLImageNativePixmap* image) { + gl::GLImage* image) { SetLevelImageInternal(target, level, image, owned_service_id_); } #endif @@ -625,10 +625,11 @@ bool TexturePassthrough::LevelInfoExists } #if BUILDFLAG(IS_OZONE) -void TexturePassthrough::SetLevelImageInternal(GLenum target, - GLint level, - GLImageNativePixmap* image, - GLuint service_id) { +void TexturePassthrough::SetLevelImageInternal( + GLenum target, + GLint level, + gl::GLImage* image, + GLuint service_id) { LevelInfo* level_info = GetLevelInfo(target, level); level_info->image = image; @@ -1879,7 +1880,7 @@ bool Texture::ClearLevel(DecoderContext* #if BUILDFLAG(IS_OZONE) void Texture::SetLevelImageInternal(GLenum target, GLint level, - GLImageNativePixmap* image, + gl::GLImage* image, ImageState state) { DCHECK(image ? state != ImageState::NOIMAGE : state == ImageState::NOIMAGE); @@ -1900,7 +1901,7 @@ void Texture::SetLevelImageInternal(GLen void Texture::SetBoundLevelImage(GLenum target, GLint level, - GLImageNativePixmap* image) { + gl::GLImage* image) { SetStreamTextureServiceId(0); SetLevelImageInternal(target, level, image, ImageState::BOUND); } @@ -2569,7 +2570,7 @@ GLsizei TextureManager::ComputeMipMapCou void TextureManager::SetBoundLevelImage(TextureRef* ref, GLenum target, GLint level, - GLImageNativePixmap* image) { + gl::GLImage* image) { DCHECK(ref); ref->texture()->SetBoundLevelImage(target, level, image); } Index: chromium_vaapi/gpu/command_buffer/service/texture_manager.h =================================================================== --- chromium_vaapi.orig/gpu/command_buffer/service/texture_manager.h +++ chromium_vaapi/gpu/command_buffer/service/texture_manager.h @@ -31,12 +31,12 @@ #include "ui/gfx/geometry/rect.h" namespace gl { +class GLImage; class ProgressReporter; } namespace gpu { class DecoderContext; -class GLImageNativePixmap; class ServiceDiscardableManager; namespace gles2 { @@ -80,7 +80,7 @@ class GPU_GLES2_EXPORT TexturePassthroug void MarkContextLost(); #if BUILDFLAG(IS_OZONE) - void SetLevelImage(GLenum target, GLint level, GLImageNativePixmap* image); + void SetLevelImage(GLenum target, GLint level, gl::GLImage* image); #endif #if BUILDFLAG(IS_ANDROID) @@ -99,7 +99,7 @@ class GPU_GLES2_EXPORT TexturePassthroug #if BUILDFLAG(IS_OZONE) void SetLevelImageInternal(GLenum target, GLint level, - GLImageNativePixmap* image, + gl::GLImage* image, GLuint service_id); #endif @@ -126,7 +126,7 @@ class GPU_GLES2_EXPORT TexturePassthroug GLenum type = 0; #if BUILDFLAG(IS_OZONE) - scoped_refptr<GLImageNativePixmap> image; + scoped_refptr<gl::GLImage> image; #endif }; @@ -175,7 +175,7 @@ class GPU_GLES2_EXPORT Texture final : p GLenum format = 0; GLenum type = 0; #if BUILDFLAG(IS_OZONE) - scoped_refptr<GLImageNativePixmap> image; + scoped_refptr<gl::GLImage> image; #endif uint32_t estimated_size = 0; bool internal_workaround = false; @@ -306,9 +306,7 @@ class GPU_GLES2_EXPORT Texture final : p // GLImage was previously set with BindToServiceId(), this will reset // |service_id_| back to |owned_service_id_|, removing the service id override // set by the BindToServiceId. - void SetBoundLevelImage(GLenum target, - GLint level, - GLImageNativePixmap* image); + void SetBoundLevelImage(GLenum target, GLint level, gl::GLImage* image); // Unset the image for a particular level. After this call, GetLevelImage() // will return nullptr. @@ -501,7 +499,7 @@ class GPU_GLES2_EXPORT Texture final : p // Helper for Set*LevelImage. void SetLevelImageInternal(GLenum target, GLint level, - GLImageNativePixmap* image, + gl::GLImage* image, ImageState state); #endif @@ -1090,7 +1088,7 @@ class GPU_GLES2_EXPORT TextureManager void SetBoundLevelImage(TextureRef* ref, GLenum target, GLint level, - GLImageNativePixmap* image); + gl::GLImage* image); void UnsetLevelImage(TextureRef* ref, GLenum target, GLint level); #endif Index: chromium_vaapi/gpu/command_buffer/service/texture_manager_unittest.cc =================================================================== --- chromium_vaapi.orig/gpu/command_buffer/service/texture_manager_unittest.cc +++ chromium_vaapi/gpu/command_buffer/service/texture_manager_unittest.cc @@ -2047,7 +2047,7 @@ TEST_P(ProduceConsumeTextureTest, Produc Texture* texture = texture_ref_->texture(); EXPECT_EQ(static_cast<GLenum>(target), texture->target()); #if BUILDFLAG(IS_OZONE) - scoped_refptr<GLImageNativePixmap> image( + scoped_refptr<gl::GLImage> image( GLImageNativePixmap::CreateForTesting(gfx::Size())); #endif manager_->SetLevelInfo(texture_ref_.get(), target, 0, GL_RGBA, 0, 0, 1, 0, @@ -2358,7 +2358,7 @@ TEST_F(SharedTextureTest, Images) { EXPECT_FALSE(ref2->texture()->HasImages()); EXPECT_FALSE(texture_manager1_->HaveImages()); EXPECT_FALSE(texture_manager2_->HaveImages()); - scoped_refptr<GLImageNativePixmap> image1( + scoped_refptr<gl::GLImage> image1( GLImageNativePixmap::CreateForTesting(gfx::Size())); texture_manager1_->SetBoundLevelImage(ref1.get(), GL_TEXTURE_2D, 1, image1.get()); @@ -2366,7 +2366,7 @@ TEST_F(SharedTextureTest, Images) { EXPECT_TRUE(ref2->texture()->HasImages()); EXPECT_TRUE(texture_manager1_->HaveImages()); EXPECT_TRUE(texture_manager2_->HaveImages()); - scoped_refptr<GLImageNativePixmap> image2( + scoped_refptr<gl::GLImage> image2( GLImageNativePixmap::CreateForTesting(gfx::Size())); texture_manager1_->SetBoundLevelImage(ref1.get(), GL_TEXTURE_2D, 1, image2.get()); Index: chromium_vaapi/gpu/command_buffer/service/validating_abstract_texture_impl.cc =================================================================== --- chromium_vaapi.orig/gpu/command_buffer/service/validating_abstract_texture_impl.cc +++ chromium_vaapi/gpu/command_buffer/service/validating_abstract_texture_impl.cc @@ -52,7 +52,7 @@ void ValidatingAbstractTextureImpl::SetP } #if BUILDFLAG(IS_OZONE) -void ValidatingAbstractTextureImpl::SetBoundImage(GLImageNativePixmap* image) { +void ValidatingAbstractTextureImpl::SetBoundImage(gl::GLImage* image) { if (!texture_ref_) { return; } Index: chromium_vaapi/gpu/command_buffer/service/validating_abstract_texture_impl.h =================================================================== --- chromium_vaapi.orig/gpu/command_buffer/service/validating_abstract_texture_impl.h +++ chromium_vaapi/gpu/command_buffer/service/validating_abstract_texture_impl.h @@ -37,7 +37,7 @@ class GPU_GLES2_EXPORT ValidatingAbstrac TextureBase* GetTextureBase() const override; void SetParameteri(GLenum pname, GLint param) override; #if BUILDFLAG(IS_OZONE) - void SetBoundImage(GLImageNativePixmap* image) override; + void SetBoundImage(gl::GLImage* image) override; #endif void SetCleared() override; Index: chromium_vaapi/media/gpu/command_buffer_helper.cc =================================================================== --- chromium_vaapi.orig/media/gpu/command_buffer_helper.cc +++ chromium_vaapi/media/gpu/command_buffer_helper.cc @@ -198,8 +198,7 @@ class CommandBufferHelperImpl } #if BUILDFLAG(IS_OZONE) - bool BindClientManagedImage(GLuint service_id, - gpu::GLImageNativePixmap* image) override { + bool BindClientManagedImage(GLuint service_id, gl::GLImage* image) override { DVLOG(2) << __func__ << "(" << service_id << ")"; DCHECK_CALLED_ON_VALID_THREAD(thread_checker_); Index: chromium_vaapi/media/gpu/command_buffer_helper.h =================================================================== --- chromium_vaapi.orig/media/gpu/command_buffer_helper.h +++ chromium_vaapi/media/gpu/command_buffer_helper.h @@ -29,12 +29,9 @@ class TextureBase; namespace gl { class GLContext; +class GLImage; } // namespace gl -namespace gpu { -class GLImageNativePixmap; -} - namespace media { class PictureBufferManagerImpl; @@ -137,7 +134,7 @@ class MEDIA_GPU_EXPORT CommandBufferHelp // // BindTexImage() will *not* be called when the texture is used. virtual bool BindClientManagedImage(GLuint service_id, - gpu::GLImageNativePixmap* image) = 0; + gl::GLImage* image) = 0; #endif // Add a callback to be called when our stub is destroyed. This callback Index: chromium_vaapi/media/gpu/gpu_video_decode_accelerator_factory.h =================================================================== --- chromium_vaapi.orig/media/gpu/gpu_video_decode_accelerator_factory.h +++ chromium_vaapi/media/gpu/gpu_video_decode_accelerator_factory.h @@ -21,10 +21,10 @@ namespace gl { class GLContext; +class GLImage; } namespace gpu { -class GLImageNativePixmap; struct GpuPreferences; namespace gles2 { @@ -57,10 +57,10 @@ class MEDIA_GPU_EXPORT GpuVideoDecodeAcc // Bind |image| to |client_texture_id| given |texture_target|, marking the // texture as not needing binding by the decoder. // Return true on success, false otherwise. - using BindGLImageCallback = base::RepeatingCallback<bool( - uint32_t client_texture_id, - uint32_t texture_target, - const scoped_refptr<gpu::GLImageNativePixmap>& image)>; + using BindGLImageCallback = + base::RepeatingCallback<bool(uint32_t client_texture_id, + uint32_t texture_target, + const scoped_refptr<gl::GLImage>& image)>; #endif // Return a ContextGroup*, if one is available. Index: chromium_vaapi/media/gpu/gpu_video_decode_accelerator_helpers.h =================================================================== --- chromium_vaapi.orig/media/gpu/gpu_video_decode_accelerator_helpers.h +++ chromium_vaapi/media/gpu/gpu_video_decode_accelerator_helpers.h @@ -13,11 +13,10 @@ namespace gl { class GLContext; +class GLImage; } namespace gpu { -class GLImageNativePixmap; - namespace gles2 { class AbstractTexture; class ContextGroup; @@ -46,10 +45,10 @@ using MakeGLContextCurrentCallback = bas // Bind |image| to |client_texture_id| given |texture_target|, marking the // texture as not needing binding by the decoder. // Return true on success, false otherwise. -using BindGLImageCallback = base::RepeatingCallback<bool( - uint32_t client_texture_id, - uint32_t texture_target, - const scoped_refptr<gpu::GLImageNativePixmap>& image)>; +using BindGLImageCallback = + base::RepeatingCallback<bool(uint32_t client_texture_id, + uint32_t texture_target, + const scoped_refptr<gl::GLImage>& image)>; #endif // Return a ContextGroup*, if one is available. @@ -86,10 +85,10 @@ struct MEDIA_GPU_EXPORT GpuVideoDecodeGL // Bind |image| to |client_texture_id| given |texture_target|, marking the // texture as not needing binding by the decoder. // Return true on success, false otherwise. - using BindGLImageCallback = base::RepeatingCallback<bool( - uint32_t client_texture_id, - uint32_t texture_target, - const scoped_refptr<gpu::GLImageNativePixmap>& image)>; + using BindGLImageCallback = + base::RepeatingCallback<bool(uint32_t client_texture_id, + uint32_t texture_target, + const scoped_refptr<gl::GLImage>& image)>; #endif // Return a ContextGroup*, if one is available. Index: chromium_vaapi/media/gpu/ipc/service/vda_video_decoder.cc =================================================================== --- chromium_vaapi.orig/media/gpu/ipc/service/vda_video_decoder.cc +++ chromium_vaapi/media/gpu/ipc/service/vda_video_decoder.cc @@ -17,7 +17,6 @@ #include "base/task/single_thread_task_runner.h" #include "build/build_config.h" #include "build/chromeos_buildflags.h" -#include "gpu/command_buffer/service/shared_image/gl_image_native_pixmap.h" #include "gpu/config/gpu_driver_bug_workarounds.h" #include "gpu/config/gpu_info.h" #include "gpu/config/gpu_preferences.h" @@ -34,6 +33,7 @@ #include "media/gpu/gpu_video_decode_accelerator_factory.h" #include "media/video/picture.h" #include "ui/gfx/geometry/rect.h" +#include "ui/gl/gl_image.h" namespace media { @@ -63,7 +63,7 @@ bool BindClientManagedImage( scoped_refptr<CommandBufferHelper> command_buffer_helper, uint32_t client_texture_id, uint32_t texture_target, - const scoped_refptr<gpu::GLImageNativePixmap>& image) { + const scoped_refptr<gl::GLImage>& image) { return command_buffer_helper->BindClientManagedImage(client_texture_id, image.get()); } Index: chromium_vaapi/media/gpu/test/fake_command_buffer_helper.cc =================================================================== --- chromium_vaapi.orig/media/gpu/test/fake_command_buffer_helper.cc +++ chromium_vaapi/media/gpu/test/fake_command_buffer_helper.cc @@ -154,9 +154,8 @@ void FakeCommandBufferHelper::SetCleared } #if BUILDFLAG(IS_OZONE) -bool FakeCommandBufferHelper::BindClientManagedImage( - GLuint service_id, - gpu::GLImageNativePixmap* image) { +bool FakeCommandBufferHelper::BindClientManagedImage(GLuint service_id, + gl::GLImage* image) { DVLOG(2) << __func__ << "(" << service_id << ")"; DCHECK(task_runner_->BelongsToCurrentThread()); DCHECK(service_ids_.count(service_id)); Index: chromium_vaapi/media/gpu/test/fake_command_buffer_helper.h =================================================================== --- chromium_vaapi.orig/media/gpu/test/fake_command_buffer_helper.h +++ chromium_vaapi/media/gpu/test/fake_command_buffer_helper.h @@ -66,8 +66,7 @@ class FakeCommandBufferHelper : public C void DestroyTexture(GLuint service_id) override; void SetCleared(GLuint service_id) override; #if BUILDFLAG(IS_OZONE) - bool BindClientManagedImage(GLuint service_id, - gpu::GLImageNativePixmap* image) override; + bool BindClientManagedImage(GLuint service_id, gl::GLImage* image) override; #endif gpu::Mailbox CreateLegacyMailbox(GLuint service_id) override; void AddWillDestroyStubCB(WillDestroyStubCB callback) override; Index: chromium_vaapi/ui/gl/BUILD.gn =================================================================== --- chromium_vaapi.orig/ui/gl/BUILD.gn +++ chromium_vaapi/ui/gl/BUILD.gn @@ -148,6 +148,10 @@ component("gl") { ] } + if (!is_android) { + sources += [ "gl_image.h" ] + } + configs += [ "//build/config:precompiled_headers" ] defines = [ "GL_IMPLEMENTATION" ] if (enable_gpu_service_logging) { Index: chromium_vaapi/ui/gl/gl_image.h =================================================================== --- /dev/null +++ chromium_vaapi/ui/gl/gl_image.h @@ -0,0 +1,44 @@ +// Copyright 2012 The Chromium Authors +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#ifndef UI_GL_GL_IMAGE_H_ +#define UI_GL_GL_IMAGE_H_ + +#include "base/memory/ref_counted.h" +#include "ui/gl/gl_export.h" + +namespace gpu::gles2 { +class GLES2DecoderImpl; +class GLES2DecoderPassthroughImpl; +} // namespace gpu::gles2 + +namespace gl { + +// Encapsulates an image that can be bound and/or copied to a texture, hiding +// platform specific management. +class GL_EXPORT GLImage : public base::RefCounted<GLImage> { + public: + GLImage(const GLImage&) = delete; + GLImage& operator=(const GLImage&) = delete; + + protected: + // NOTE: We are in the process of eliminating client usage of GLImage. As part + // of this effort, we have moved its public interface to be protected with + // friend'ing of existing users. DO NOT ADD MORE client usage - instead, reach + // out to shared-image-team@ with your use case. + // See crbug.com/1382031. + GLImage() = default; + + virtual ~GLImage() = default; + + private: + friend class gpu::gles2::GLES2DecoderImpl; + friend class gpu::gles2::GLES2DecoderPassthroughImpl; + + friend class base::RefCounted<GLImage>; +}; + +} // namespace gl + +#endif // UI_GL_GL_IMAGE_H_ Index: chromium_vaapi/ui/ozone/gl/DEPS =================================================================== --- chromium_vaapi.orig/ui/ozone/gl/DEPS +++ chromium_vaapi/ui/ozone/gl/DEPS @@ -1,8 +1,5 @@ specific_include_rules = { - # NOTE: See comment in ./BUILD.gn with respect to these dependencies. - "gl_image_test_template\.h": [ - "+gpu/command_buffer/service/shared_image/gl_image_native_pixmap.h", - ], + # NOTE: See comment in ./BUILD.gn with respect to this dependency. "gl_image_ozone_native_pixmap_unittest\.cc": [ "+gpu/command_buffer/service/shared_image/gl_image_native_pixmap.h", ], Index: chromium_vaapi/ui/ozone/gl/gl_image_ozone_native_pixmap_unittest.cc =================================================================== --- chromium_vaapi.orig/ui/ozone/gl/gl_image_ozone_native_pixmap_unittest.cc +++ chromium_vaapi/ui/ozone/gl/gl_image_ozone_native_pixmap_unittest.cc @@ -52,9 +52,8 @@ class GLImageNativePixmapTestDelegate : return false; } - scoped_refptr<gpu::GLImageNativePixmap> CreateSolidColorImage( - const gfx::Size& size, - const uint8_t color[4]) { + scoped_refptr<GLImage> CreateSolidColorImage(const gfx::Size& size, + const uint8_t color[4]) { ui::SurfaceFactoryOzone* surface_factory = ui::OzonePlatform::GetInstance()->GetSurfaceFactoryOzone(); scoped_refptr<gfx::NativePixmap> pixmap = Index: chromium_vaapi/ui/ozone/gl/gl_image_test_template.h =================================================================== --- chromium_vaapi.orig/ui/ozone/gl/gl_image_test_template.h +++ chromium_vaapi/ui/ozone/gl/gl_image_test_template.h @@ -11,7 +11,6 @@ #include "base/memory/raw_ptr.h" #include "base/strings/stringize_macros.h" #include "build/build_config.h" -#include "gpu/command_buffer/service/shared_image/gl_image_native_pixmap.h" #include "testing/gtest/include/gtest/gtest.h" #include "third_party/abseil-cpp/absl/types/optional.h" #include "ui/gfx/buffer_format_util.h" @@ -20,6 +19,7 @@ #include "ui/gl/gl_context.h" #include "ui/gl/gl_display.h" #include "ui/gl/gl_helper.h" +#include "ui/gl/gl_image.h" #include "ui/gl/gl_surface.h" #include "ui/gl/gl_version_info.h" #include "ui/gl/init/gl_factory.h" @@ -107,13 +107,13 @@ TYPED_TEST_P_WITH_EXPANSION(GLImageTest, // Create a small solid color green image of preferred format. This must // succeed in order for a GLImage to be conformant. - scoped_refptr<gpu::GLImageNativePixmap> small_image = + scoped_refptr<GLImage> small_image = this->delegate_.CreateSolidColorImage(small_image_size, image_color); ASSERT_TRUE(small_image); // Create a large solid color green image of preferred format. This must // succeed in order for a GLImage to be conformant. - scoped_refptr<gpu::GLImageNativePixmap> large_image = + scoped_refptr<GLImage> large_image = this->delegate_.CreateSolidColorImage(large_image_size, image_color); ASSERT_TRUE(large_image); } @@ -138,7 +138,7 @@ TYPED_TEST_P_WITH_EXPANSION(GLImageOddSi // Create an odd-sized solid color green image of preferred format. This must // succeed in order for a GLImage to be conformant. - scoped_refptr<gpu::GLImageNativePixmap> odd_image = + scoped_refptr<GLImage> odd_image = this->delegate_.CreateSolidColorImage(odd_image_size, image_color); ASSERT_TRUE(odd_image); }
Locations
Projects
Search
Status Monitor
Help
OpenBuildService.org
Documentation
API Documentation
Code of Conduct
Contact
Support
@OBShq
Terms
openSUSE Build Service is sponsored by
The Open Build Service is an
openSUSE project
.
Sign Up
Log In
Places
Places
All Projects
Status Monitor
