am 840b8a67: Revert "Add a LayerScreenshot" (cdec8f01) · Commits · e / os / platform_frameworks_native

include/surfaceflinger/ISurfaceComposer.h

+0 −1

Original line number	Diff line number	Diff line
		@@ -53,7 +53,6 @@ public:
		eFXSurfaceNormal = 0x00000000,
		eFXSurfaceBlur = 0x00010000,
		eFXSurfaceDim = 0x00020000,
		eFXSurfaceScreenshot= 0x00030000,
		eFXSurfaceMask = 0x000F0000,
		};

services/surfaceflinger/Android.mk

+0 −1

Original line number	Diff line number	Diff line
		@@ -5,7 +5,6 @@ LOCAL_SRC_FILES:= \
		Layer.cpp \
		LayerBase.cpp \
		LayerDim.cpp \
		LayerScreenshot.cpp \
		DdmConnection.cpp \
		DisplayHardware/DisplayHardware.cpp \
		DisplayHardware/DisplayHardwareBase.cpp \

services/surfaceflinger/Layer.cpp

+10 −2

Original line number	Diff line number	Diff line
		@@ -88,8 +88,16 @@ void Layer::onFirstRef()

		Layer::~Layer()
		{
		mFlinger->postMessageAsync(
		new SurfaceFlinger::MessageDestroyGLTexture(mTextureName) );
		class MessageDestroyGLState : public MessageBase {
		GLuint texture;
		public:
		MessageDestroyGLState(GLuint texture) : texture(texture) { }
		virtual bool handler() {
		glDeleteTextures(1, &texture);
		return true;
		}
		};
		mFlinger->postMessageAsync( new MessageDestroyGLState(mTextureName) );
		}

		void Layer::onFrameQueued() {

services/surfaceflinger/LayerScreenshot.cpp

deleted100644 → 0

+0 −116

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 <stdlib.h>
		#include <stdint.h>
		#include <sys/types.h>

		#include <utils/Errors.h>
		#include <utils/Log.h>

		#include <ui/GraphicBuffer.h>

		#include "LayerScreenshot.h"
		#include "SurfaceFlinger.h"
		#include "DisplayHardware/DisplayHardware.h"

		namespace android {
		// ---------------------------------------------------------------------------

		LayerScreenshot::LayerScreenshot(SurfaceFlinger* flinger, DisplayID display,
		const sp<Client>& client)
		: LayerBaseClient(flinger, display, client),
		mTextureName(0), mFlinger(flinger)
		{
		}

		LayerScreenshot::~LayerScreenshot()
		{
		if (mTextureName) {
		mFlinger->postMessageAsync(
		new SurfaceFlinger::MessageDestroyGLTexture(mTextureName) );
		}
		}

		status_t LayerScreenshot::capture() {
		GLfloat u, v;
		status_t result = mFlinger->renderScreenToTexture(0, &mTextureName, &u, &v);
		if (result != NO_ERROR) {
		return result;
		}

		glBindTexture(GL_TEXTURE_2D, mTextureName);
		glTexParameterx(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
		glTexParameterx(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);

		mTexCoords[0] = 0; mTexCoords[1] = v;
		mTexCoords[2] = 0; mTexCoords[3] = 0;
		mTexCoords[4] = u; mTexCoords[5] = 0;
		mTexCoords[6] = u; mTexCoords[7] = v;

		return NO_ERROR;
		}

		void LayerScreenshot::onDraw(const Region& clip) const
		{
		const State& s(drawingState());
		Region::const_iterator it = clip.begin();
		Region::const_iterator const end = clip.end();
		if (s.alpha>0 && (it != end)) {
		const DisplayHardware& hw(graphicPlane(0).displayHardware());
		const GLfloat alpha = s.alpha/255.0f;
		const uint32_t fbHeight = hw.getHeight();
		glDisable(GL_DITHER);

		if (s.alpha == 0xFF) {
		glDisable(GL_BLEND);
		} else {
		glEnable(GL_BLEND);
		glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
		}

		glColor4f(0, 0, 0, alpha);

		#if defined(GL_OES_EGL_image_external)
		if (GLExtensions::getInstance().haveTextureExternal()) {
		glDisable(GL_TEXTURE_EXTERNAL_OES);
		}
		#endif

		glBindTexture(GL_TEXTURE_2D, mTextureName);
		glTexEnvx(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
		glEnable(GL_TEXTURE_2D);
		glMatrixMode(GL_TEXTURE);
		glLoadIdentity();
		glMatrixMode(GL_MODELVIEW);

		glEnableClientState(GL_TEXTURE_COORD_ARRAY);
		glTexCoordPointer(2, GL_FLOAT, 0, mTexCoords);
		glVertexPointer(2, GL_FLOAT, 0, mVertices);

		while (it != end) {
		const Rect& r = *it++;
		const GLint sy = fbHeight - (r.top + r.height());
		glScissor(r.left, sy, r.width(), r.height());
		glDrawArrays(GL_TRIANGLE_FAN, 0, 4);
		}
		}
		glDisableClientState(GL_TEXTURE_COORD_ARRAY);
		}

		// ---------------------------------------------------------------------------

		}; // namespace android

services/surfaceflinger/LayerScreenshot.h

deleted100644 → 0

+0 −56

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 ANDROID_LAYER_SCREENSHOT_H
		#define ANDROID_LAYER_SCREENSHOT_H

		#include <stdint.h>
		#include <sys/types.h>

		#include <EGL/egl.h>
		#include <EGL/eglext.h>

		#include "LayerBase.h"

		// ---------------------------------------------------------------------------

		namespace android {

		class LayerScreenshot : public LayerBaseClient
		{
		GLuint mTextureName;
		GLfloat mTexCoords[8];
		sp<SurfaceFlinger> mFlinger;
		public:
		LayerScreenshot(SurfaceFlinger* flinger, DisplayID display,
		const sp<Client>& client);
		virtual ~LayerScreenshot();

		status_t capture();

		virtual void onDraw(const Region& clip) const;
		virtual bool isOpaque() const { return false; }
		virtual bool isSecure() const { return false; }
		virtual bool isProtectedByApp() const { return false; }
		virtual bool isProtectedByDRM() const { return false; }
		virtual const char* getTypeId() const { return "LayerScreenshot"; }
		};

		// ---------------------------------------------------------------------------

		}; // namespace android

		#endif // ANDROID_LAYER_SCREENSHOT_H