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

Fix ANGLE build with extended clang warnings

Browse Source 
Add newline-eof to the list of ignroed warnings.
Fix shadowed fields.

Bug: skia:
Change-Id: I4985ce2495194a7f805af98c4f42c44691086e36
Reviewed-on: https://skia-review.googlesource.com/79681
Commit-Queue: Chris Dalton <csmartdalton@google.com>
Reviewed-by: Mike Klein <mtklein@chromium.org>
This commit is contained in:
Chris Dalton 2017-12-04 13:31:21 -07:00 committed by Skia Commit-Bot
parent 60b1b6e76e
commit d1ec4105f7
2 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
gn/BUILD.gn
View File

@ -369,6 +369,7 @@ config("warnings") {
"-Wno-missing-noreturn",
"-Wno-old-style-cast",
"-Wno-padded",
"-Wno-newline-eof",
]
cflags_cc += [
"-Wno-c++98-compat",

24
tools/sk_app/win/ANGLEWindowContext_win.cpp
View File

@ -48,8 +48,8 @@ protected:
private:
HWND fHWND;
EGLDisplay fDisplay = EGL_NO_DISPLAY;
EGLContext fContext = EGL_NO_CONTEXT;
EGLSurface fSurface = EGL_NO_SURFACE;
EGLContext fEGLContext = EGL_NO_CONTEXT;
EGLSurface fEGLSurface = EGL_NO_SURFACE;
typedef GLWindowContext INHERITED;
};
@ -101,17 +101,17 @@ sk_sp<const GrGLInterface> ANGLEGLWindowContext_win::onInitializeContext() {
}
// We currently only support ES3.
const EGLint contextAttribs[] = {EGL_CONTEXT_CLIENT_VERSION, 3, EGL_NONE};
fContext = eglCreateContext(fDisplay, surfaceConfig, nullptr, contextAttribs);
if (EGL_NO_CONTEXT == fContext) {
fEGLContext = eglCreateContext(fDisplay, surfaceConfig, nullptr, contextAttribs);
if (EGL_NO_CONTEXT == fEGLContext) {
SkDebugf("Could not create context!\n");
return nullptr;
}
fSurface = eglCreateWindowSurface(fDisplay, surfaceConfig, fHWND, nullptr);
if (EGL_NO_SURFACE == fSurface) {
fEGLSurface = eglCreateWindowSurface(fDisplay, surfaceConfig, fHWND, nullptr);
if (EGL_NO_SURFACE == fEGLSurface) {
SkDebugf("Could not create surface!\n");
return nullptr;
}
if (!eglMakeCurrent(fDisplay, fSurface, fSurface, fContext)) {
if (!eglMakeCurrent(fDisplay, fEGLSurface, fEGLSurface, fEGLContext)) {
SkDebugf("Could not make contxt current!\n");
return nullptr;
}
@ -142,11 +142,11 @@ sk_sp<const GrGLInterface> ANGLEGLWindowContext_win::onInitializeContext() {
void ANGLEGLWindowContext_win::onDestroyContext() {
eglMakeCurrent(fDisplay, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT);
if (EGL_NO_CONTEXT != fContext) {
eglDestroyContext(fDisplay, fContext);
if (EGL_NO_CONTEXT != fEGLContext) {
eglDestroyContext(fDisplay, fEGLContext);
}
if (EGL_NO_SURFACE != fSurface) {
eglDestroySurface(fDisplay, fSurface);
if (EGL_NO_SURFACE != fEGLSurface) {
eglDestroySurface(fDisplay, fEGLSurface);
}
if (EGL_NO_DISPLAY != fDisplay) {
eglTerminate(fDisplay);
@ -154,7 +154,7 @@ void ANGLEGLWindowContext_win::onDestroyContext() {
}
void ANGLEGLWindowContext_win::onSwapBuffers() {
if (!eglSwapBuffers(fDisplay, fSurface)) {
if (!eglSwapBuffers(fDisplay, fEGLSurface)) {
SkDebugf("Could not complete eglSwapBuffers.\n");
}
}