Delete GLESRenderEngine (e2b61c62) · Commits · e / os / platform_frameworks_native

libs/renderengine/Android.bp

+1 −25

Original line number	Original line	Diff line number	Diff line
	@@ -56,30 +56,8 @@ cc_defaults {
	filegroup {		filegroup {
	name: "librenderengine_sources",		name: "librenderengine_sources",
	srcs: [		srcs: [
	"Description.cpp",
	"ExternalTexture.cpp",		"ExternalTexture.cpp",
	"Mesh.cpp",
	"RenderEngine.cpp",		"RenderEngine.cpp",
	"Texture.cpp",
	],
	}

	filegroup {
	name: "librenderengine_gl_sources",
	srcs: [
	"gl/GLESRenderEngine.cpp",
	"gl/GLExtensions.cpp",
	"gl/GLFramebuffer.cpp",
	"gl/GLImage.cpp",
	"gl/GLShadowTexture.cpp",
	"gl/GLShadowVertexGenerator.cpp",
	"gl/GLSkiaShadowPort.cpp",
	"gl/GLVertexBuffer.cpp",
	"gl/ImageManager.cpp",
	"gl/Program.cpp",
	"gl/ProgramCache.cpp",
	"gl/filters/BlurFilter.cpp",
	"gl/filters/GenericProgram.cpp",
	],		],
	}		}

	@@ -96,6 +74,7 @@ filegroup {
	"skia/AutoBackendTexture.cpp",		"skia/AutoBackendTexture.cpp",
	"skia/Cache.cpp",		"skia/Cache.cpp",
	"skia/ColorSpaces.cpp",		"skia/ColorSpaces.cpp",
			"skia/GLExtensions.cpp",
	"skia/SkiaRenderEngine.cpp",		"skia/SkiaRenderEngine.cpp",
	"skia/SkiaGLRenderEngine.cpp",		"skia/SkiaGLRenderEngine.cpp",
	"skia/SkiaVkRenderEngine.cpp",		"skia/SkiaVkRenderEngine.cpp",
	@@ -136,7 +115,6 @@ cc_library_static {
	],		],
	srcs: [		srcs: [
	":librenderengine_sources",		":librenderengine_sources",
	":librenderengine_gl_sources",
	":librenderengine_threaded_sources",		":librenderengine_threaded_sources",
	":librenderengine_skia_sources",		":librenderengine_skia_sources",
	],		],
	@@ -155,8 +133,6 @@ cc_library_static {
	name: "librenderengine_mocks",		name: "librenderengine_mocks",
	defaults: ["librenderengine_defaults"],		defaults: ["librenderengine_defaults"],
	srcs: [		srcs: [
	"mock/Framebuffer.cpp",
	"mock/Image.cpp",
	"mock/RenderEngine.cpp",		"mock/RenderEngine.cpp",
	],		],
	static_libs: [		static_libs: [

libs/renderengine/Description.cpp

deleted100644 → 0

+0 −61

Original line number	Original line	Diff line number	Diff line
	/*
	* Copyright 2013 The Android Open Source Project
	*
	* Licensed under the Apache License, Version 2.0 (the "License");
	* you may not use this file except in compliance with the License.
	* You may obtain a copy of the License at
	*
	* http://www.apache.org/licenses/LICENSE-2.0
	*
	* Unless required by applicable law or agreed to in writing, software
	* distributed under the License is distributed on an "AS IS" BASIS,
	* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
	* See the License for the specific language governing permissions and
	* limitations under the License.
	*/

	#include <renderengine/private/Description.h>

	#include <stdint.h>

	#include <utils/TypeHelpers.h>

	namespace android {
	namespace renderengine {

	Description::TransferFunction Description::dataSpaceToTransferFunction(ui::Dataspace dataSpace) {
	ui::Dataspace transfer = static_cast<ui::Dataspace>(dataSpace & ui::Dataspace::TRANSFER_MASK);
	switch (transfer) {
	case ui::Dataspace::TRANSFER_ST2084:
	return Description::TransferFunction::ST2084;
	case ui::Dataspace::TRANSFER_HLG:
	return Description::TransferFunction::HLG;
	case ui::Dataspace::TRANSFER_LINEAR:
	return Description::TransferFunction::LINEAR;
	default:
	return Description::TransferFunction::SRGB;
	}
	}

	bool Description::hasInputTransformMatrix() const {
	const mat4 identity;
	return inputTransformMatrix != identity;
	}

	bool Description::hasOutputTransformMatrix() const {
	const mat4 identity;
	return outputTransformMatrix != identity;
	}

	bool Description::hasColorMatrix() const {
	const mat4 identity;
	return colorMatrix != identity;
	}

	bool Description::hasDisplayColorMatrix() const {
	const mat4 identity;
	return displayColorMatrix != identity;
	}

	} // namespace renderengine
	} // namespace android

libs/renderengine/ExternalTexture.cpp

+0 −8

Original line number	Original line	Diff line number	Diff line
	@@ -27,14 +27,6 @@ ExternalTexture::ExternalTexture(const sp<GraphicBuffer>& buffer,
	: mBuffer(buffer), mRenderEngine(renderEngine), mWritable(usage & WRITEABLE) {		: mBuffer(buffer), mRenderEngine(renderEngine), mWritable(usage & WRITEABLE) {
	LOG_ALWAYS_FATAL_IF(buffer == nullptr,		LOG_ALWAYS_FATAL_IF(buffer == nullptr,
	"Attempted to bind a null buffer to an external texture!");		"Attempted to bind a null buffer to an external texture!");
	// GLESRenderEngine has a separate texture cache for output buffers,
	if (usage == WRITEABLE &&
	(mRenderEngine.getRenderEngineType() ==
	renderengine::RenderEngine::RenderEngineType::GLES \|\|
	mRenderEngine.getRenderEngineType() ==
	renderengine::RenderEngine::RenderEngineType::THREADED)) {
	return;
	}
	mRenderEngine.mapExternalTextureBuffer(mBuffer, mWritable);		mRenderEngine.mapExternalTextureBuffer(mBuffer, mWritable);
	}		}

libs/renderengine/Mesh.cpp

deleted100644 → 0

+0 −146

Original line number	Original line	Diff line number	Diff line
	/*
	* Copyright 2013 The Android Open Source Project
	*
	* Licensed under the Apache License, Version 2.0 (the "License");
	* you may not use this file except in compliance with the License.
	* You may obtain a copy of the License at
	*
	* http://www.apache.org/licenses/LICENSE-2.0
	*
	* Unless required by applicable law or agreed to in writing, software
	* distributed under the License is distributed on an "AS IS" BASIS,
	* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
	* See the License for the specific language governing permissions and
	* limitations under the License.
	*/

	#include <renderengine/Mesh.h>

	#include <utils/Log.h>

	namespace android {
	namespace renderengine {

	Mesh::Mesh(Primitive primitive, size_t vertexCount, size_t vertexSize, size_t texCoordSize,
	size_t cropCoordsSize, size_t shadowColorSize, size_t shadowParamsSize,
	size_t indexCount)
	: mVertexCount(vertexCount),
	mVertexSize(vertexSize),
	mTexCoordsSize(texCoordSize),
	mCropCoordsSize(cropCoordsSize),
	mShadowColorSize(shadowColorSize),
	mShadowParamsSize(shadowParamsSize),
	mPrimitive(primitive),
	mIndexCount(indexCount) {
	if (vertexCount == 0) {
	mVertices.resize(1);
	mVertices[0] = 0.0f;
	mStride = 0;
	return;
	}
	size_t stride = vertexSize + texCoordSize + cropCoordsSize + shadowColorSize + shadowParamsSize;
	size_t remainder = (stride * vertexCount) / vertexCount;
	// Since all of the input parameters are unsigned, if stride is less than
	// either vertexSize or texCoordSize, it must have overflowed. remainder
	// will be equal to stride as long as stride * vertexCount doesn't overflow.
	if ((stride < vertexSize) \|\| (remainder != stride)) {
	ALOGE("Overflow in Mesh(..., %zu, %zu, %zu, %zu, %zu, %zu)", vertexCount, vertexSize,
	texCoordSize, cropCoordsSize, shadowColorSize, shadowParamsSize);
	mVertices.resize(1);
	mVertices[0] = 0.0f;
	mVertexCount = 0;
	mVertexSize = 0;
	mTexCoordsSize = 0;
	mCropCoordsSize = 0;
	mShadowColorSize = 0;
	mShadowParamsSize = 0;
	mStride = 0;
	return;
	}

	mVertices.resize(stride * vertexCount);
	mStride = stride;
	mIndices.resize(indexCount);
	}

	Mesh::Primitive Mesh::getPrimitive() const {
	return mPrimitive;
	}

	float const* Mesh::getPositions() const {
	return mVertices.data();
	}
	float* Mesh::getPositions() {
	return mVertices.data();
	}

	float const* Mesh::getTexCoords() const {
	return mVertices.data() + mVertexSize;
	}
	float* Mesh::getTexCoords() {
	return mVertices.data() + mVertexSize;
	}

	float const* Mesh::getCropCoords() const {
	return mVertices.data() + mVertexSize + mTexCoordsSize;
	}
	float* Mesh::getCropCoords() {
	return mVertices.data() + mVertexSize + mTexCoordsSize;
	}

	float const* Mesh::getShadowColor() const {
	return mVertices.data() + mVertexSize + mTexCoordsSize + mCropCoordsSize;
	}
	float* Mesh::getShadowColor() {
	return mVertices.data() + mVertexSize + mTexCoordsSize + mCropCoordsSize;
	}

	float const* Mesh::getShadowParams() const {
	return mVertices.data() + mVertexSize + mTexCoordsSize + mCropCoordsSize + mShadowColorSize;
	}
	float* Mesh::getShadowParams() {
	return mVertices.data() + mVertexSize + mTexCoordsSize + mCropCoordsSize + mShadowColorSize;
	}

	uint16_t const* Mesh::getIndices() const {
	return mIndices.data();
	}

	uint16_t* Mesh::getIndices() {
	return mIndices.data();
	}

	size_t Mesh::getVertexCount() const {
	return mVertexCount;
	}

	size_t Mesh::getVertexSize() const {
	return mVertexSize;
	}

	size_t Mesh::getTexCoordsSize() const {
	return mTexCoordsSize;
	}

	size_t Mesh::getShadowColorSize() const {
	return mShadowColorSize;
	}

	size_t Mesh::getShadowParamsSize() const {
	return mShadowParamsSize;
	}

	size_t Mesh::getByteStride() const {
	return mStride * sizeof(float);
	}

	size_t Mesh::getStride() const {
	return mStride;
	}

	size_t Mesh::getIndexCount() const {
	return mIndexCount;
	}

	} // namespace renderengine
	} // namespace android

libs/renderengine/RenderEngine.cpp

+0 −10

Original line number	Original line	Diff line number	Diff line
	@@ -18,7 +18,6 @@

	#include <cutils/properties.h>		#include <cutils/properties.h>
	#include <log/log.h>		#include <log/log.h>
	#include "gl/GLESRenderEngine.h"
	#include "renderengine/ExternalTexture.h"		#include "renderengine/ExternalTexture.h"
	#include "threaded/RenderEngineThreaded.h"		#include "threaded/RenderEngineThreaded.h"

	@@ -30,11 +29,6 @@ namespace renderengine {

	std::unique_ptr<RenderEngine> RenderEngine::create(const RenderEngineCreationArgs& args) {		std::unique_ptr<RenderEngine> RenderEngine::create(const RenderEngineCreationArgs& args) {
	switch (args.renderEngineType) {		switch (args.renderEngineType) {
	case RenderEngineType::THREADED:
	ALOGD("Threaded RenderEngine with GLES Backend");
	return renderengine::threaded::RenderEngineThreaded::create(
	[args]() { return android::renderengine::gl::GLESRenderEngine::create(args); },
	args.renderEngineType);
	case RenderEngineType::SKIA_GL:		case RenderEngineType::SKIA_GL:
	ALOGD("RenderEngine with SkiaGL Backend");		ALOGD("RenderEngine with SkiaGL Backend");
	return renderengine::skia::SkiaGLRenderEngine::create(args);		return renderengine::skia::SkiaGLRenderEngine::create(args);
	@@ -56,10 +50,6 @@ std::unique_ptr<RenderEngine> RenderEngine::create(const RenderEngineCreationArg
	return android::renderengine::skia::SkiaVkRenderEngine::create(args);		return android::renderengine::skia::SkiaVkRenderEngine::create(args);
	},		},
	args.renderEngineType);		args.renderEngineType);
	case RenderEngineType::GLES:
	default:
	ALOGD("RenderEngine with GLES Backend");
	return renderengine::gl::GLESRenderEngine::create(args);
	}		}
	}		}