Use new LOD approximation rules for OpenGL ES

author Pyry Haulos <phaulos@google.com>

Sun, 2 Apr 2017 23:20:02 +0000 (23:20 +0000)

committer android-build-merger <android-build-merger@google.com>

Sun, 2 Apr 2017 23:20:02 +0000 (23:20 +0000)
author Pyry Haulos <phaulos@google.com>
Sun, 2 Apr 2017 23:20:02 +0000 (23:20 +0000)
committer android-build-merger <android-build-merger@google.com>
Sun, 2 Apr 2017 23:20:02 +0000 (23:20 +0000)
diff --cc modules/gles3/functional/es3fTextureFilteringTests.cpp
Simple merge
diff --cc modules/gles31/functional/es31fStencilTexturingTests.cpp
Simple merge
diff --cc modules/gles31/functional/es31fTextureFilteringTests.cpp
Simple merge
author	Pyry Haulos <phaulos@google.com>
	Sun, 2 Apr 2017 23:20:02 +0000 (23:20 +0000)
committer	android-build-merger <android-build-merger@google.com>
	Sun, 2 Apr 2017 23:20:02 +0000 (23:20 +0000)
		1	2
modules/gles3/functional/es3fTextureFilteringTests.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
modules/gles31/functional/es31fStencilTexturingTests.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
modules/gles31/functional/es31fTextureFilteringTests.cpp	patch \|	diff1 \|	diff2 \|	blob \| history