corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 1773359 - Remove TRANSPARENT workaround in webrender bindings. r=gfx-reviewers,jrmuizel

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D148679
This commit is contained in:
Emilio Cobos Álvarez
2022-06-08 19:19:08 +00:00
parent 0d7f176edd
commit 0db24532ae
2 changed files with 1 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
config/windows-h-constant.decls.h
View File

@@ -51,6 +51,7 @@ auto READ_CONTROL;
auto WRITE_DAC; auto WRITE_DAC;
auto WRITE_OWNER; auto WRITE_OWNER;
auto SYNCHRONIZE; auto SYNCHRONIZE;
auto TRANSPARENT;
auto MAXIMUM_ALLOWED; auto MAXIMUM_ALLOWED;
auto GENERIC_READ; auto GENERIC_READ;

6
gfx/webrender_bindings/webrender_ffi.h
View File

@@ -95,14 +95,8 @@ void omta_sample(mozilla::wr::WrWindowId aWindowId,
void omta_deregister_sampler(mozilla::wr::WrWindowId aWindowId); void omta_deregister_sampler(mozilla::wr::WrWindowId aWindowId);
} // extern "C" } // extern "C"
// Work-around wingdi.h define which conflcits with WR color constant
#pragma push_macro("TRANSPARENT")
#undef TRANSPARENT
#include "webrender_ffi_generated.h" #include "webrender_ffi_generated.h"
#pragma pop_macro("TRANSPARENT")
template struct mozilla::wr::Point2D<int32_t, mozilla::wr::DevicePixel>; template struct mozilla::wr::Point2D<int32_t, mozilla::wr::DevicePixel>;
template struct mozilla::wr::Point2D<int, mozilla::wr::WorldPixel>; template struct mozilla::wr::Point2D<int, mozilla::wr::WorldPixel>;
template struct mozilla::wr::Point2D<float, mozilla::wr::WorldPixel>; template struct mozilla::wr::Point2D<float, mozilla::wr::WorldPixel>;