Commit 4db09b47 authored by Will Harris's avatar Will Harris Committed by Commit Bot

Suppress -Wshorten-64-to-32 warnings in gles2 generated code.

Also remove legacy /WD4267 and replace with the compiler config.

Warnings being suppressed are here: https://pastebin.com/raw/QkwwCZLb

BUG=879657

Cq-Include-Trybots: luci.chromium.try:android_optional_gpu_tests_rel;luci.chromium.try:linux_optional_gpu_tests_rel;luci.chromium.try:mac_optional_gpu_tests_rel;luci.chromium.try:win_optional_gpu_tests_rel
Change-Id: If145532f415cdcc4c52a48dc11f421171538b25d
Reviewed-on: https://chromium-review.googlesource.com/1199869Reviewed-by: default avatarKenneth Russell <kbr@chromium.org>
Commit-Queue: Will Harris <wfh@chromium.org>
Cr-Commit-Position: refs/heads/master@{#588226}
parent c66a8553
...@@ -103,7 +103,10 @@ source_set("gles2_cmd_helper_sources") { ...@@ -103,7 +103,10 @@ source_set("gles2_cmd_helper_sources") {
"gles2_cmd_helper_autogen.h", "gles2_cmd_helper_autogen.h",
] ]
configs += [ "//gpu:gpu_gles2_implementation" ] configs += [
"//build/config/compiler:no_shorten_64_warnings",
"//gpu:gpu_gles2_implementation",
]
deps = [ deps = [
":client", ":client",
......
...@@ -124,7 +124,10 @@ source_set("gles2_sources") { ...@@ -124,7 +124,10 @@ source_set("gles2_sources") {
"gles2_cmd_ids_autogen.h", "gles2_cmd_ids_autogen.h",
] ]
configs += [ "//gpu:gpu_gles2_implementation" ] configs += [
"//gpu:gpu_gles2_implementation",
"//build/config/compiler:no_shorten_64_warnings",
]
deps = [ deps = [
":gles2_utils", ":gles2_utils",
......
...@@ -407,6 +407,7 @@ if (internal_gles2_conform_tests) { ...@@ -407,6 +407,7 @@ if (internal_gles2_conform_tests) {
] ]
configs += [ configs += [
"//build/config/compiler:no_incompatible_pointer_warnings", "//build/config/compiler:no_incompatible_pointer_warnings",
"//build/config/compiler:no_shorten_64_warnings",
# Must be done this way for warning flags to be ordered correctly. # Must be done this way for warning flags to be ordered correctly.
":gles2_conform_test_warnings", ":gles2_conform_test_warnings",
...@@ -436,7 +437,6 @@ if (internal_gles2_conform_tests) { ...@@ -436,7 +437,6 @@ if (internal_gles2_conform_tests) {
"/wd4706", # assignment within conditional expression "/wd4706", # assignment within conditional expression
"/wd4715", # not all control paths return a value "/wd4715", # not all control paths return a value
"/wd4716", # function must return a value "/wd4716", # function must return a value
"/wd4267", # size_t/unsigned int conversion
] ]
} }
if (is_mac) { if (is_mac) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment