AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

work around x11/X.h #define pollution

Browse Source 
Some nerve those folks have to #define None 0L.

Cq-Include-Trybots: skia.primary:Build-Debian9-Clang-x86_64-Debug-SwiftShader
Change-Id: I0c84f78ec72672648d1c0bde69b6e05433b80d56
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/251516
Reviewed-by: Mike Klein <mtklein@google.com>
Commit-Queue: Mike Klein <mtklein@google.com>
This commit is contained in:
Mike Klein 2019-10-29 17:18:47 -05:00 committed by Skia Commit-Bot
parent 014f540f70
commit 07c6c6668c
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/core/SkVM.cpp
View File

@ -791,11 +791,11 @@ namespace skvm {
void Assembler::vcvttps2dq(Ymm dst, Ymm x) { this->op(0xf3,0x0f,0x5b, dst,x); }
Assembler::Label Assembler::here() {
return { (int)this->size(), Label::None, {} };
return { (int)this->size(), Label::NotYetSet, {} };
}
int Assembler::disp19(Label* l) {
SkASSERT(l->kind == Label::None ||
SkASSERT(l->kind == Label::NotYetSet ||
l->kind == Label::ARMDisp19);
l->kind = Label::ARMDisp19;
l->references.push_back(here().offset);
@ -804,7 +804,7 @@ namespace skvm {
}
int Assembler::disp32(Label* l) {
SkASSERT(l->kind == Label::None ||
SkASSERT(l->kind == Label::NotYetSet ||
l->kind == Label::X86Disp32);
l->kind = Label::X86Disp32;
l->references.push_back(here().offset);

6
src/core/SkVM.h
View File

@ -86,9 +86,9 @@ namespace skvm {
void vpblendvb(Ymm dst, Ymm x, Ymm y, Ymm z);
struct Label {
int offset = 0;
enum { None, ARMDisp19, X86Disp32 } kind = None;
std::vector<int> references;
int offset = 0;
enum { NotYetSet, ARMDisp19, X86Disp32 } kind = NotYetSet;
std::vector<int> references;
};
Label here();