fd1fb639a1
Squashed commit of the following:
commit 012d3fe41d1d6cd38a0858b59145e9a4447641fa
Author: Hashcode <hashcode0f@gmail.com>
Date: Sun Dec 8 19:36:50 2013 +0000
sf: Always use opengles for screen capture
Go back to the usage of GRALLOC_USAGE_HW_TEXTURE and GRALLOC_USAGE_HW_RENDERER
in captureScreenImplLocked regardless of useReadPixels value
This fixes the EGL_NO_IMAGE_KHR error returned from
eglCreateImageKHR (blank images returned from screenshot path)
Change-Id: I62fe90a081607b9e89c67f3dcfd34c84efc89d35
commit 4866ddf98ac98d8e22a1cd6a21894bb17f274588
Author: Ricardo Cerqueira <cyanogenmod@cerqueira.org>
Date: Thu Oct 31 03:53:39 2013 +0000
Revert "remove support for glReadPixels screenshot path"
This reverts commit 3ca76f416b.
Conflicts:
include/gui/ISurfaceComposer.h
libs/gui/ISurfaceComposer.cpp
libs/gui/SurfaceComposerClient.cpp
services/surfaceflinger/SurfaceFlinger.cpp
services/surfaceflinger/SurfaceFlinger.h
Change-Id: I8c239e533757af770e418dbb198f5a86c736961f
Change-Id: I8c239e533757af770e418dbb198f5a86c736961f
75 lines
2.4 KiB
C++
75 lines
2.4 KiB
C++
/*
|
|
* 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.
|
|
*/
|
|
|
|
|
|
#ifndef SF_GLES11RENDERENGINE_H_
|
|
#define SF_GLES11RENDERENGINE_H_
|
|
|
|
#include <stdint.h>
|
|
#include <sys/types.h>
|
|
|
|
#include <GLES/gl.h>
|
|
#include <Transform.h>
|
|
|
|
#include "RenderEngine.h"
|
|
|
|
// ---------------------------------------------------------------------------
|
|
namespace android {
|
|
// ---------------------------------------------------------------------------
|
|
|
|
class String8;
|
|
class Mesh;
|
|
class Texture;
|
|
|
|
class GLES11RenderEngine : public RenderEngine {
|
|
GLuint mProtectedTexName;
|
|
GLint mMaxViewportDims[2];
|
|
GLint mMaxTextureSize;
|
|
|
|
virtual void bindImageAsFramebuffer(EGLImageKHR image,
|
|
uint32_t* texName, uint32_t* fbName, uint32_t* status, bool useReadPixels,
|
|
int reqWidth, int reqHeight);
|
|
virtual void unbindFramebuffer(uint32_t texName, uint32_t fbName, bool useReadPixels);
|
|
|
|
public:
|
|
GLES11RenderEngine();
|
|
|
|
protected:
|
|
virtual ~GLES11RenderEngine();
|
|
|
|
virtual void dump(String8& result);
|
|
virtual void setViewportAndProjection(size_t vpw, size_t vph,
|
|
Rect sourceCrop, size_t hwh, bool yswap, Transform::orientation_flags rotation);
|
|
virtual void setupLayerBlending(bool premultipliedAlpha, bool opaque, int alpha);
|
|
virtual void setupDimLayerBlending(int alpha);
|
|
virtual void setupLayerTexturing(const Texture& texture);
|
|
virtual void setupLayerBlackedOut();
|
|
virtual void setupFillWithColor(float r, float g, float b, float a) ;
|
|
virtual void disableTexturing();
|
|
virtual void disableBlending();
|
|
|
|
virtual void drawMesh(const Mesh& mesh);
|
|
|
|
virtual size_t getMaxTextureSize() const;
|
|
virtual size_t getMaxViewportDims() const;
|
|
};
|
|
|
|
// ---------------------------------------------------------------------------
|
|
}; // namespace android
|
|
// ---------------------------------------------------------------------------
|
|
|
|
#endif /* SF_GLES11RENDERENGINE_H_ */
|