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

Compile with GCC 7.2.0.

Browse Source 
This suppresses the noexcept-type warning, since Skia doesn't have a
stable ABI in any event. GCC now warns on more printf style formats,
so we have to hide our bad test formats a little better. GCC now
also warns on implicit enum to bool conversions, which did catch two
issues.

Change-Id: Ib81769c421757186506873f0fe298ecd0106ae87
Reviewed-on: https://skia-review.googlesource.com/114263
Commit-Queue: Ben Wagner <bungeman@google.com>
Reviewed-by: Mike Klein <mtklein@chromium.org>
Reviewed-by: Brian Salomon <bsalomon@google.com>
This commit is contained in:
Ben Wagner 2018-03-13 16:56:43 -04:00 committed by Skia Commit-Bot
parent 40481bb392
commit f8a131dd47
4 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
example/SkiaSDLExample.cpp
View File

@ -208,11 +208,12 @@ int main(int argc, char** argv) {
info.fFBOID = (GrGLuint) buffer;
SkColorType colorType;
//SkDebugf("%s", SDL_GetPixelFormatName(windowFormat));
// TODO: the windowFormat is never any of these?
if (SDL_PIXELFORMAT_RGBA8888 == windowFormat) {
info.fFormat = GR_GL_RGBA8;
colorType = kRGBA_8888_SkColorType;
} else {
SkASSERT(SDL_PIXELFORMAT_BGRA8888);
colorType = kBGRA_8888_SkColorType;
if (SDL_GL_CONTEXT_PROFILE_ES == contextType) {
info.fFormat = GR_GL_BGRA8;

5
gn/BUILD.gn
View File

@ -299,7 +299,10 @@ config("warnings") {
"-Wno-deprecated-declarations",
"-Wno-maybe-uninitialized",
]
cflags_cc += [ "-Wnon-virtual-dtor" ]
cflags_cc += [
"-Wnon-virtual-dtor",
"-Wno-noexcept-type",
]
}
if (is_clang) {

6
src/gpu/gl/GrGLCaps.cpp
View File

@ -1996,8 +1996,10 @@ void GrGLCaps::initConfigTable(const GrContextOptions& contextOptions,
for (int i = 0; i < kGrPixelConfigCnt; ++i) {
// Make sure we didn't set renderable and not blittable or renderable with msaa and not
// renderable.
SkASSERT(!((ConfigInfo::kRenderable_Flag) && !(ConfigInfo::kFBOColorAttachment_Flag)));
SkASSERT(!((ConfigInfo::kRenderableWithMSAA_Flag) && !(ConfigInfo::kRenderable_Flag)));
SkASSERT(!((fConfigTable[i].fFlags & ConfigInfo::kRenderable_Flag) &&
!(fConfigTable[i].fFlags & ConfigInfo::kFBOColorAttachment_Flag)));
SkASSERT(!((fConfigTable[i].fFlags & ConfigInfo::kRenderableWithMSAA_Flag) &&
!(fConfigTable[i].fFlags & ConfigInfo::kRenderable_Flag)));
SkASSERT(defaultEntry.fFormats.fBaseInternalFormat !=
fConfigTable[i].fFormats.fBaseInternalFormat);
SkASSERT(defaultEntry.fFormats.fSizedInternalFormat !=

4
tests/StringTest.cpp
View File

@ -14,6 +14,8 @@
#include "SkString.h"
#include "SkStringUtils.h"
static const char* gThirtyWideDecimal = "%30d";
DEF_TEST(String, reporter) {
SkString a;
SkString b((size_t)0);
@ -169,7 +171,7 @@ DEF_TEST(String, reporter) {
REPORTER_ASSERT(reporter, buffer[18] == 'a');
REPORTER_ASSERT(reporter, buffer[19] == 'a');
REPORTER_ASSERT(reporter, buffer[20] == 'a');
snprintf(buffer, 20, "%30d", 0);
snprintf(buffer, 20, gThirtyWideDecimal, 0);
REPORTER_ASSERT(reporter, buffer[18] == ' ');
REPORTER_ASSERT(reporter, buffer[19] == 0);
REPORTER_ASSERT(reporter, buffer[20] == 'a');