Merge a44c8d2 into ffdd2f9

tensorflow · Oct 3, 2019 · c17ea4e · c17ea4e
2 parents ffdd2f9 + a44c8d2
commit c17ea4e
Show file tree

Hide file tree

Showing 14 changed files with 3,270 additions and 49 deletions.
diff --git a/tensorflow_graphics/rendering/opengl/BUILD b/tensorflow_graphics/rendering/opengl/BUILD
@@ -39,13 +39,28 @@ cc_library(
     srcs = ["egl_offscreen_context.cc"],
     hdrs = ["egl_offscreen_context.h"],
     deps = [
+        ":EGL_headers",
+        ":egl_util",
         ":gl_macros",
-        "//third_party/GL:EGL_headers",
-        "//third_party/GL/util:egl_util",
-        "//third_party/tensorflow/core:lib",
+        "//tensorflow_graphics/util:cleanup",
     ],
 )
 
+cc_library(
+    name = "EGL_headers",
+    hdrs = [
+        "EGL/egl.h",
+        "EGL/eglext.h",
+        "EGL/eglplatform.h",
+        "KHR/khrplatform.h",
+    ],
+    defines = ["USE_OZONE"],
+    features = [
+        "-parse_headers",
+    ],
+    includes = ["."],
+)
+
 cc_test(
     name = "egl_offscreen_context_test",
     srcs = ["tests/egl_offscreen_context_test.cc"],
@@ -56,7 +71,26 @@ cc_test(
     deps = [
         ":egl_offscreen_context",
         ":gl_native_libs",
-        "//third_party/GL:GLES3_headers",
+        "@com_google_googletest//:gtest_main",
+    ],
+)
+
+cc_library(
+    name = "egl_util",
+    srcs = ["egl_util.cc"],
+    hdrs = ["egl_util.h"],
+    visibility = ["//visibility:public"],
+    deps = [
+        ":EGL_headers",
+    ],
+)
+
+cc_test(
+    name = "egl_util_test",
+    srcs = ["egl_util_test.cc"],
+    deps = [
+        ":EGL_headers",
+        ":egl_util",
         "@com_google_googletest//:gtest_main",
     ],
 )
@@ -65,18 +99,16 @@ cc_library(
     name = "gl_macros",
     hdrs = ["gl_macros.h"],
     deps = [
-        "//third_party/GL:EGL_headers",
-        "//third_party/GL:GLES3_headers",
+        ":EGL_headers",
         "@com_google_absl//absl/strings",
     ],
 )
 
 cc_library(
     name = "gl_native_libs",
-    deps = [
-        "//third_party/GL/native:EGL",  # buildcleaner: keep
-        "//third_party/GL/native:GLESv3",  # buildcleaner: keep
-        "//third_party/GL/native:nvidia_egl_device_isolation_mitigation",  # buildcleaner: keep
+    linkopts = [
+        "-lEGL",
+        "-lGLESv2",
     ],
     alwayslink = 1,
 )
@@ -87,8 +119,7 @@ cc_library(
     hdrs = ["gl_utils.h"],
     deps = [
         ":gl_macros",
-        "//third_party/GL:GLES3_headers",
-        "//third_party/tensorflow/core:lib",
+        "//tensorflow_graphics/util:cleanup",
         "@com_google_absl//absl/types:span",
     ],
 )
@@ -104,7 +135,6 @@ cc_test(
         ":egl_offscreen_context",
         ":gl_native_libs",
         ":gl_utils",
-        "//third_party/GL:GLES3_headers",
         "@com_google_absl//absl/types:span",
         "@com_google_googletest//:gtest_main",
     ],