Rename gn options to skgpu_v1 and skgpu_v2

Bug: skia:11837
Change-Id: Ie9221d2cd8e42bebb6a8a9a8ef51ba4a488ce6ca
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/424036
Reviewed-by: Greg Daniel <egdaniel@google.com>
Commit-Queue: Robert Phillips <robertphillips@google.com>

BUILD.gn

@@ -54,10 +54,10 @@ config("skia_public") {
       "SK_USE_WEBGL",
     ]
   }
-  if (skia_enable_nga) {
+  if (skia_enable_skgpu_v2) {
     defines += [ "GR_NGA=1" ]
   }
-  if (!skia_enable_oga) {
+  if (!skia_enable_skgpu_v1) {
     defines += [ "GR_OGA=0" ]
   }
 
@@ -910,11 +910,11 @@ optional("gpu") {
 
   sources =
       skia_gpu_sources + skia_sksl_gpu_sources + skia_gpu_processor_outputs
-  if (skia_enable_nga) {
+  if (skia_enable_skgpu_v2) {
-    sources += skia_nga_sources
+    sources += skia_skgpu_v2_sources
   }
-  if (!skia_enable_oga) {
+  if (!skia_enable_skgpu_v1) {
-    sources -= skia_oga_sources
+    sources -= skia_skgpu_v1_sources
   }
 
   libs = []
@@ -1978,8 +1978,8 @@ if (skia_enable_tools) {
     if (skia_use_gl) {
       sources += gl_gm_sources
     }
-    if (!skia_enable_oga) {
+    if (!skia_enable_skgpu_v1) {
-      sources -= oga_gm_sources
+      sources -= skgpu_v1_gm_sources
     }
     deps = [
       ":etc1",
@@ -2034,8 +2034,8 @@ if (skia_enable_tools) {
     if (skia_use_gl) {
       sources += gl_tests_sources
     }
-    if (!skia_enable_oga) {
+    if (!skia_enable_skgpu_v1) {
-      sources -= oga_tests_sources
+      sources -= skgpu_v1_tests_sources
     }
     deps = [
       ":flags",
@@ -2099,8 +2099,8 @@ if (skia_enable_tools) {
   import("gn/samples.gni")
   test_lib("samples") {
     sources = samples_sources
-    if (!skia_enable_oga) {
+    if (!skia_enable_skgpu_v1) {
-      sources -= oga_samples_sources
+      sources -= skgpu_v1_samples_sources
     }
     public_deps = [ ":tool_utils" ]
     deps = [

experimental/skottiekit/compile.sh

@@ -163,7 +163,7 @@ echo "Compiling bitcode"
   ${GN_GPU} \
   \
   skia_enable_skshaper=true \
-  skia_enable_nga=false \
+  skia_enable_skgpu_v2=false \
   skia_enable_pdf=false"
 
 # Build all the libs we will need below

experimental/wasm-skp-debugger/compile.sh

@@ -110,7 +110,7 @@ echo "Compiling bitcode"
   skia_gl_standard=\"webgl\" \
   skia_enable_tools=false \
   skia_enable_skshaper=false \
-  skia_enable_nga=false \
+  skia_enable_skgpu_v2=false \
   skia_enable_fontmgr_custom_directory=false \
   skia_enable_fontmgr_custom_embedded=true \
   skia_enable_fontmgr_custom_empty=false \

gn/gm.gni

@@ -415,10 +415,10 @@ gm_sources = [
 
 gl_gm_sources = [ "$_gm/rectangletexture.cpp" ]
 
-oga_gm_sources = [
+skgpu_v1_gm_sources = [
   "$_gm/gpu_blur_utils.cpp",
   "$_gm/preservefillrule.cpp",
   "$_gm/widebuttcaps.cpp",
 ]
 
-gm_sources += oga_gm_sources
+gm_sources += skgpu_v1_gm_sources

gn/gpu.gni

@@ -551,13 +551,13 @@ skia_gl_gpu_sources = [
 
 skia_null_gpu_sources = [ "$_src/gpu/gl/GrGLMakeNativeInterface_none.cpp" ]
 
-skia_nga_sources = [
+skia_skgpu_v2_sources = [
   # Sk files
   "$_src/gpu/SkGpuDevice_nga.cpp",
   "$_src/gpu/SkGpuDevice_nga.h",
 ]
 
-skia_oga_sources = [
+skia_skgpu_v1_sources = [
   "$_src/gpu/GrClipStack.cpp",
   "$_src/gpu/GrClipStack.h",
   "$_src/gpu/GrClipStackClip.cpp",
@@ -599,7 +599,7 @@ skia_oga_sources = [
   "$_src/gpu/SkGpuDevice_drawTexture.cpp",
 ]
 
-skia_gpu_sources += skia_oga_sources
+skia_gpu_sources += skia_skgpu_v1_sources
 
 skia_vk_sources = [
   "$_include/gpu/vk/GrVkBackendContext.h",

gn/samples.gni

@@ -83,6 +83,6 @@ samples_sources = [
   "$_samplecode/vertexdump.cpp",
 ]
 
-oga_samples_sources = [ "$_samplecode/SamplePathTessellators.cpp" ]
+skgpu_v1_samples_sources = [ "$_samplecode/SamplePathTessellators.cpp" ]
 
-samples_sources += oga_samples_sources
+samples_sources += skgpu_v1_samples_sources

gn/skia.gni

@@ -13,8 +13,8 @@ declare_args() {
   skia_compile_processors = false
   skia_enable_api_available_macro = true
   skia_enable_android_utils = is_skia_dev_build
-  skia_enable_nga = false
+  skia_enable_skgpu_v2 = false
-  skia_enable_oga = true
+  skia_enable_skgpu_v1 = true
   skia_enable_discrete_gpu = true
   skia_enable_flutter_defines = false
   skia_enable_fontmgr_empty = false

gn/tests.gni

@@ -424,9 +424,9 @@ pathops_tests_sources = [
   "$_tests/WangsFormulaTest.cpp",
 ]
 
-oga_tests_sources = [
+skgpu_v1_tests_sources = [
   "$_tests/GrClipStackTest.cpp",
   "$_tests/PathRendererCacheTests.cpp",
 ]
 
-tests_sources += oga_tests_sources
+tests_sources += skgpu_v1_tests_sources

modules/canvaskit/compile.sh

@@ -103,13 +103,13 @@ if [[ $@ == *no_skottie* ]]; then
   SKOTTIE_BINDINGS=""
 fi
 
-GN_VIEWER="skia_use_expat=false skia_enable_nga=false"
+GN_VIEWER="skia_use_expat=false skia_enable_skgpu_v2=false"
 VIEWER_BINDINGS=""
 VIEWER_LIB=""
 
 if [[ $@ == *viewer* ]]; then
   echo "Including viewer"
-  GN_VIEWER="skia_use_expat=true skia_enable_nga=false"
+  GN_VIEWER="skia_use_expat=true skia_enable_skgpu_v2=false"
   VIEWER_BINDINGS="$BASE_DIR/viewer_bindings.cpp"
   VIEWER_LIB="$BUILD_DIR/libviewer_wasm.a"
   IS_OFFICIAL_BUILD="false"

modules/canvaskit/compile_gm.sh

@@ -128,7 +128,7 @@ echo "Compiling bitcode"
   ${GN_GPU} \
   ${GN_FONT} \
   skia_use_expat=true \
-  skia_enable_nga=false \
+  skia_enable_skgpu_v2=false \
   skia_enable_svg=true \
   skia_enable_skshaper=true \
   skia_enable_skparagraph=true \