Merge vk-gl-cts/opengl-cts-4.6.0 into vk-gl-cts/master

[platform/upstream/VK-GL-CTS.git] / external / openglcts / README.md

diff --git a/external/openglcts/README.md b/external/openglcts/README.md
index 27d5b87..95a9b30 100644 (file)
--- a/external/openglcts/README.md
+++ b/external/openglcts/README.md
@@ -218,19 +218,25 @@ To download sources, run:
 
        python external/fetch_sources.py
 
-To download Khronos Confidential Conformance Test Suite, run:
+For OpenGL CTS releases, and OpenGL ES CTS releases prior to opengl-es-cts-3.2.4.0
+download Khronos Confidential Conformance Test Suite:
 
        python external/fetch_kc_cts.py
 
-The results for the tests included in this suite must be included in a
+For OpenGL CTS releases, and OpenGL ES CTS releases prior to opengl-es-cts-3.2.4.0
+the results for the tests included in this suite must be included in a
 conformance submission.
 
 **NOTE**: You need to be a Khronos Adopter and have an active account
 at [Khronos Gitlab](https://gitlab.khronos.org/) to be able to download
 Khronos Confidential CTS.
 It is possible to run and build the CTS without the Khronos Confidential CTS.
-Khronos Confidential CTS is mandatory only if you plan to make a
+For OpenGL CTS releases, and OpenGL ES CTS releases prior to opengl-es-cts-3.2.4.0
+Khronos Confidential CTS is mandatory if you plan to make a
 conformance submission (see [Creating a Submission Package](#creating-a-submission-package)).
+For opengl-es-cts-3.2.4.0 and later OpenGL ES CTS releases Khronos Confidential CTS
+results must not be included in a submission package.
+
 
 With CMake out-of-source builds are always recommended. Create a build directory
 of your choosing, and in that directory generate Makefiles or IDE project
@@ -321,14 +327,14 @@ are needed in order to build an Android binary:
 
 An Android binary (for ES 3.2) can be built using command:
 
-       python scripts/android/build_apk.py --target=openglcts
+       python scripts/android/build_apk.py --target=openglcts --sdk <path to Android SDK> --ndk <path to Android NDK>
 
 If Khronos Confidential CTS is present then the script will set `GLCTS_GTF_TARGET`
 to `gles32` by default.
 It is possible to specify a different `GLCTS_GTF_TARGET` target by invoking the script
 with the `--kc-cts-target` option, e.g.:
 
-       python scripts/android/build_apk.py --target=openglcts --kc-cts-target=gles31
+       python scripts/android/build_apk.py --target=openglcts --kc-cts-target=gles31 --sdk <path to Android SDK> --ndk <path to Android NDK>
 
 Available values for `--kc-cts-target` are `gles32`, `gles31`, `gles3`, `gles2` and `gl`.
 
@@ -344,12 +350,6 @@ instead:
 
        adb install --abi <ABI name> <build root>/Khronos-CTS.apk /data/local/tmp/Khronos-CTS.apk
 
-The script assumes some default install locations, which should be changed based
-on your environment. It is a good idea to check at least variables
-`ANDROID_NDK_PATH`, `ANDROID_SDK_PATH`, and `ANDROID_NDK_HOST_OS`.
-The `ANDROID_NDK_HOST_OS` is used to select the correct compiler binaries from
-in the Android NDK package.
-
 Porting
 ------------------------
 The Conformance Tests have been designed to be relatively platform-, OS-, and
@@ -409,9 +409,8 @@ Running the Tests
 ------------------------
 All the following commands need to be run in the CTS build directory. If you
 need to move the binaries from the build directory, remember to copy the
-data directory named `gl_cts` and its subdirectories from the build directory
-to the test target in the same relative locations. For more information on data
-files, see Section [Data Files](#data-files) later in the document.
+data directories named `gl_cts`, `gles2`, `gles3`, and `gles31` and its subdirectories
+from the build directory to the test target in the same relative locations.
 
 If the build instructions have been followed as-is, the correct path is: