Merge "Moving samplers behind the hal." (6b7d778f) · Commits · e / os / android_frameworks_base

libs/rs/Android.mk

+1 −0

Original line number	Diff line number	Diff line
		@@ -124,6 +124,7 @@ LOCAL_SRC_FILES:= \
		driver/rsdProgramStore.cpp \
		driver/rsdRuntimeMath.cpp \
		driver/rsdRuntimeStubs.cpp \
		driver/rsdSampler.cpp \
		driver/rsdShader.cpp \
		driver/rsdShaderCache.cpp \
		driver/rsdVertexArray.cpp

libs/rs/driver/rsdCore.cpp

+7 −1

Original line number	Diff line number	Diff line
		@@ -22,6 +22,7 @@
		#include "rsdProgramVertex.h"
		#include "rsdProgramFragment.h"
		#include "rsdMesh.h"
		#include "rsdSampler.h"

		#include <malloc.h>
		#include "rsContext.h"
		@@ -90,7 +91,12 @@ static RsdHalFunctions FunctionTable = {
		rsdMeshInit,
		rsdMeshDraw,
		rsdMeshDestroy
		}
		},

		{
		rsdSamplerInit,
		rsdSamplerDestroy
		},

		};

libs/rs/driver/rsdSampler.cpp

0 → 100644

+40 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2011 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 "rsdCore.h"
		#include "rsdSampler.h"

		#include "rsContext.h"
		#include "rsSampler.h"
		#include "rsProgramVertex.h"
		#include "rsProgramFragment.h"

		#include <GLES/gl.h>
		#include <GLES/glext.h>


		using namespace android;
		using namespace android::renderscript;

		bool rsdSamplerInit(const android::renderscript::Context *,
		const android::renderscript::Sampler *) {
		return true;
		}

		void rsdSamplerDestroy(const android::renderscript::Context *rsc,
		const android::renderscript::Sampler *s) {
		}

libs/rs/driver/rsdSampler.h

0 → 100644

+30 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2011 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.
		*/

		#ifndef RSD_SAMPLER_H
		#define RSD_SAMPLER_H

		#include <rs_hal.h>


		bool rsdSamplerInit(const android::renderscript::Context *rsc,
		const android::renderscript::Sampler *);

		void rsdSamplerDestroy(const android::renderscript::Context *rsc,
		const android::renderscript::Sampler *);


		#endif // RSD_SAMPLER_H

libs/rs/driver/rsdShader.cpp

+66 −1

Original line number	Diff line number	Diff line
		@@ -21,6 +21,7 @@
		#include <rsContext.h>
		#include <rsProgram.h>

		#include "rsdCore.h"
		#include "rsdShader.h"
		#include "rsdShaderCache.h"

		@@ -315,6 +316,70 @@ void RsdShader::setUniform(const Context rsc, const Element field, const float
		}
		}

		void RsdShader::setupSampler(const Context rsc, const Sampler s, const Allocation *tex) {
		RsdHal dc = (RsdHal )rsc->mHal.drv;

		GLenum trans[] = {
		GL_NEAREST, //RS_SAMPLER_NEAREST,
		GL_LINEAR, //RS_SAMPLER_LINEAR,
		GL_LINEAR_MIPMAP_LINEAR, //RS_SAMPLER_LINEAR_MIP_LINEAR,
		GL_REPEAT, //RS_SAMPLER_WRAP,
		GL_CLAMP_TO_EDGE, //RS_SAMPLER_CLAMP
		GL_LINEAR_MIPMAP_NEAREST, //RS_SAMPLER_LINEAR_MIP_NEAREST
		};

		GLenum transNP[] = {
		GL_NEAREST, //RS_SAMPLER_NEAREST,
		GL_LINEAR, //RS_SAMPLER_LINEAR,
		GL_LINEAR, //RS_SAMPLER_LINEAR_MIP_LINEAR,
		GL_CLAMP_TO_EDGE, //RS_SAMPLER_WRAP,
		GL_CLAMP_TO_EDGE, //RS_SAMPLER_CLAMP
		GL_LINEAR, //RS_SAMPLER_LINEAR_MIP_NEAREST,
		};

		// This tells us the correct texture type
		GLenum target = (GLenum)tex->getGLTarget();

		if (!dc->gl.gl.OES_texture_npot && tex->getType()->getIsNp2()) {
		if (tex->getHasGraphicsMipmaps() &&
		(dc->gl.gl.GL_NV_texture_npot_2D_mipmap \|\| dc->gl.gl.GL_IMG_texture_npot)) {
		if (dc->gl.gl.GL_NV_texture_npot_2D_mipmap) {
		glTexParameteri(target, GL_TEXTURE_MIN_FILTER, trans[s->mHal.state.minFilter]);
		} else {
		switch (trans[s->mHal.state.minFilter]) {
		case GL_LINEAR_MIPMAP_LINEAR:
		glTexParameteri(target, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_NEAREST);
		break;
		default:
		glTexParameteri(target, GL_TEXTURE_MIN_FILTER, trans[s->mHal.state.minFilter]);
		break;
		}
		}
		} else {
		glTexParameteri(target, GL_TEXTURE_MIN_FILTER, transNP[s->mHal.state.minFilter]);
		}
		glTexParameteri(target, GL_TEXTURE_MAG_FILTER, transNP[s->mHal.state.magFilter]);
		glTexParameteri(target, GL_TEXTURE_WRAP_S, transNP[s->mHal.state.wrapS]);
		glTexParameteri(target, GL_TEXTURE_WRAP_T, transNP[s->mHal.state.wrapT]);
		} else {
		if (tex->getHasGraphicsMipmaps()) {
		glTexParameteri(target, GL_TEXTURE_MIN_FILTER, trans[s->mHal.state.minFilter]);
		} else {
		glTexParameteri(target, GL_TEXTURE_MIN_FILTER, transNP[s->mHal.state.minFilter]);
		}
		glTexParameteri(target, GL_TEXTURE_MAG_FILTER, trans[s->mHal.state.magFilter]);
		glTexParameteri(target, GL_TEXTURE_WRAP_S, trans[s->mHal.state.wrapS]);
		glTexParameteri(target, GL_TEXTURE_WRAP_T, trans[s->mHal.state.wrapT]);
		}

		float anisoValue = rsMin(dc->gl.gl.EXT_texture_max_aniso, s->mHal.state.aniso);
		if (dc->gl.gl.EXT_texture_max_aniso > 1.0f) {
		glTexParameterf(target, GL_TEXTURE_MAX_ANISOTROPY_EXT, anisoValue);
		}

		rsc->checkError("Sampler::setupGL2 tex env");
		}

		void RsdShader::setupTextures(const Context rsc, RsdShaderCache sc) {
		if (mRSProgram->mHal.state.texturesCount == 0) {
		return;
		@@ -345,7 +410,7 @@ void RsdShader::setupTextures(const Context rsc, RsdShaderCache sc) {
		glBindTexture(target, mRSProgram->mHal.state.textures[ct]->getTextureID());
		rsc->checkError("ProgramFragment::setupGL2 tex bind");
		if (mRSProgram->mHal.state.samplers[ct].get()) {
		mRSProgram->mHal.state.samplers[ct]->setupGL(rsc, mRSProgram->mHal.state.textures[ct].get());
		setupSampler(rsc, mRSProgram->mHal.state.samplers[ct].get(), mRSProgram->mHal.state.textures[ct].get());
		} else {
		glTexParameteri(target, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
		glTexParameteri(target, GL_TEXTURE_MAG_FILTER, GL_NEAREST);