Bug 1343984 - Comment out the unused WrExternalImageIdType stuff as it produces hard-to-remove webrender_bindings warnings. r?jrmuizel
MozReview-Commit-ID: BFSqSnW96Oc
--- a/gfx/webrender_bindings/RendererOGL.cpp
+++ b/gfx/webrender_bindings/RendererOGL.cpp
@@ -11,17 +11,17 @@
#include "mozilla/layers/CompositorThread.h"
#include "mozilla/widget/CompositorWidget.h"
namespace mozilla {
namespace wr {
WrExternalImage LockExternalImage(void* aObj, WrExternalImageId aId)
{
- return WrExternalImage { WrExternalImageIdType::TEXTURE_HANDLE, 0.0f, 0.0f, 0.0f, 0.0f, 0 };
+ return WrExternalImage { /*WrExternalImageIdType::TextureHandle, */0.0f, 0.0f, 0.0f, 0.0f, 0 };
}
void UnlockExternalImage(void* aObj, WrExternalImageId aId)
{
}
void ReleaseExternalImage(void* aObj, WrExternalImageId aId)
{
--- a/gfx/webrender_bindings/src/bindings.rs
+++ b/gfx/webrender_bindings/src/bindings.rs
@@ -441,27 +441,26 @@ impl WebRenderFrameBuilder {
}
pub struct WrState {
pipeline_id: PipelineId,
z_index: i32,
frame_builder: WebRenderFrameBuilder,
}
-#[repr(C)]
-enum WrExternalImageType {
- TEXTURE_HANDLE,
-
- // TODO(Jerry): handle shmem or cpu raw buffers.
- //// MEM_OR_SHMEM,
-}
+// TODO(Jerry): handle shmem or cpu raw buffers.
+//#[repr(C)]
+//enum WrExternalImageType {
+// TextureHandle,
+// MemOrShmem,
+//}
#[repr(C)]
struct WrExternalImageStruct {
- image_type: WrExternalImageType,
+ //image_type: WrExternalImageType,
// Texture coordinate
u0: f32,
v0: f32,
u1: f32,
v1: f32,
// external buffer handle
@@ -483,26 +482,27 @@ pub struct WrExternalImageHandler {
unlock_func: UnlockExternalImageCallback,
release_func: ReleaseExternalImageCallback,
}
impl ExternalImageHandler for WrExternalImageHandler {
fn lock(&mut self, id: ExternalImageId) -> ExternalImage {
let image = (self.lock_func)(self.external_image_obj, id);
- match image.image_type {
- WrExternalImageType::TEXTURE_HANDLE =>
+ // TODO(Jerry): handle shmem or cpu raw buffers.
+ //match image.image_type {
+ // WrExternalImageType::TextureHandle =>
ExternalImage {
u0: image.u0,
v0: image.v0,
u1: image.u1,
v1: image.v1,
source: ExternalImageSource::NativeTexture(image.handle)
- },
- }
+ }
+ //}
}
fn unlock(&mut self, id: ExternalImageId) {
(self.unlock_func)(self.external_image_obj, id);
}
fn release(&mut self, id: ExternalImageId) {
(self.release_func)(self.external_image_obj, id);
--- a/gfx/webrender_bindings/webrender_ffi.h
+++ b/gfx/webrender_bindings/webrender_ffi.h
@@ -110,22 +110,24 @@ enum class WrImageRendering: uint32_t
{
Auto = 0,
CrispEdges = 1,
Pixelated = 2,
Sentinel /* this must be last, for IPC serialization purposes */
};
-enum class WrExternalImageIdType
-{
- TEXTURE_HANDLE, // Currently, we only support gl texture handle.
- // TODO(Jerry): handle shmem or cpu raw buffers.
- //// MEM_OR_SHMEM,
-};
+// TODO(Jerry): handle shmem or cpu raw buffers.
+//enum class WrExternalImageIdType: uint32_t
+//{
+// TextureHandle = 0,
+// MemOrShmem = 1,
+//
+// Sentinel /* this must be last, for IPC serialization purposes */
+//};
enum class WrMixBlendMode: uint32_t
{
Normal = 0,
Multiply = 1,
Screen = 2,
Overlay = 3,
Darken = 4,
@@ -302,17 +304,17 @@ struct WrImageMask
struct WrExternalImageId
{
WrImageIdType id;
};
struct WrExternalImage
{
- WrExternalImageIdType type;
+ //WrExternalImageIdType type;
// Texture coordinate
float u0, v0;
float u1, v1;
// external buffer handle
uint32_t handle;