| commit | deda34b0d40b8cea039766895789099d34589a5d | [log] [tgz] |
|---|---|---|
| author | Nicolas Capens <capn@google.com> | Tue Apr 28 15:21:53 2015 -0700 |
| committer | Nicolas Capens <capn@google.com> | Tue Apr 28 23:46:15 2015 +0000 |
| tree | 450cf5193e428f2d2cb4e2d1c0188a69a4d63a2a | |
| parent | 4be3370a0997494005784988c6784629ac558034 [diff] [blame] |
Combine es2::Image and es1::Image into egl::Image. Change-Id: Iadd4ce8ac36ad3458741f244423731fa00d7fd84 Reviewed-on: https://swiftshader-review.googlesource.com/2982 Reviewed-by: Nicolas Capens <capn@google.com> Tested-by: Nicolas Capens <capn@google.com>
diff --git a/src/Android.mk b/src/Android.mk index dbf2932..9695f3b 100644 --- a/src/Android.mk +++ b/src/Android.mk
@@ -67,6 +67,7 @@ LOCAL_SRC_FILES += \ OpenGL/common/AndroidCommon.cpp \ + OpenGL/common/Image.cpp \ OpenGL/common/NameSpace.cpp \ OpenGL/common/Object.cpp \ OpenGL/common/MatrixStack.cpp \