am f33e4b6f: GraphicBufferAlloc class was declared twice (488978de) · Commits · e / os / android_frameworks_native

services/surfaceflinger/Android.mk

+1 −0

Original line number	Diff line number	Diff line
		@@ -11,6 +11,7 @@ LOCAL_SRC_FILES:= \
		LayerDim.cpp \
		LayerScreenshot.cpp \
		DisplayHardware/FramebufferSurface.cpp \
		DisplayHardware/GraphicBufferAlloc.cpp \
		DisplayHardware/HWComposer.cpp \
		DisplayHardware/PowerHAL.cpp \
		GLExtensions.cpp \

services/surfaceflinger/DisplayHardware/FramebufferSurface.cpp

+1 −12

Original line number	Diff line number	Diff line
		@@ -33,24 +33,13 @@
		#include <ui/GraphicBuffer.h>

		#include "DisplayHardware/FramebufferSurface.h"
		#include "DisplayHardware/GraphicBufferAlloc.h"
		#include "DisplayHardware/HWComposer.h"

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

		class GraphicBufferAlloc : public BnGraphicBufferAlloc {
		public:
		GraphicBufferAlloc() { };
		virtual ~GraphicBufferAlloc() { };
		virtual sp<GraphicBuffer> createGraphicBuffer(uint32_t w, uint32_t h,
		PixelFormat format, uint32_t usage, status_t* error) {
		sp<GraphicBuffer> graphicBuffer(new GraphicBuffer(w, h, format, usage));
		return graphicBuffer;
		}
		};


		/*
		* This implements the (main) framebuffer management. This class is used
		* mostly by SurfaceFlinger, but also by command line GL application.

services/surfaceflinger/DisplayHardware/GraphicBufferAlloc.cpp

0 → 100644

+53 −0

Original line number	Diff line number	Diff line
		/*
		**
		** Copyright 2012 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 <cutils/log.h>

		#include <ui/GraphicBuffer.h>

		#include "DisplayHardware/GraphicBufferAlloc.h"

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

		GraphicBufferAlloc::GraphicBufferAlloc() {
		}

		GraphicBufferAlloc::~GraphicBufferAlloc() {
		}

		sp<GraphicBuffer> GraphicBufferAlloc::createGraphicBuffer(uint32_t w, uint32_t h,
		PixelFormat format, uint32_t usage, status_t* error) {
		sp<GraphicBuffer> graphicBuffer(new GraphicBuffer(w, h, format, usage));
		status_t err = graphicBuffer->initCheck();
		*error = err;
		if (err != 0 \|\| graphicBuffer->handle == 0) {
		if (err == NO_MEMORY) {
		GraphicBuffer::dumpAllocationsToSystemLog();
		}
		ALOGE("GraphicBufferAlloc::createGraphicBuffer(w=%d, h=%d) "
		"failed (%s), handle=%p",
		w, h, strerror(-err), graphicBuffer->handle);
		return 0;
		}
		return graphicBuffer;
		}

		// ----------------------------------------------------------------------------
		}; // namespace android
		// ----------------------------------------------------------------------------

services/surfaceflinger/DisplayHardware/GraphicBufferAlloc.h

0 → 100644

+44 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2012 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_SF_GRAPHIC_BUFFER_ALLOC_H
		#define ANDROID_SF_GRAPHIC_BUFFER_ALLOC_H

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

		#include <gui/IGraphicBufferAlloc.h>
		#include <ui/PixelFormat.h>
		#include <utils/Errors.h>

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

		class GraphicBuffer;

		class GraphicBufferAlloc : public BnGraphicBufferAlloc {
		public:
		GraphicBufferAlloc();
		virtual ~GraphicBufferAlloc();
		virtual sp<GraphicBuffer> createGraphicBuffer(uint32_t w, uint32_t h,
		PixelFormat format, uint32_t usage, status_t* error);
		};


		// ---------------------------------------------------------------------------
		}; // namespace android

		#endif // ANDROID_SF_GRAPHIC_BUFFER_ALLOC_H

services/surfaceflinger/SurfaceFlinger.cpp

+1 −23

Original line number	Diff line number	Diff line
		@@ -63,6 +63,7 @@
		#include "SurfaceFlinger.h"

		#include "DisplayHardware/FramebufferSurface.h"
		#include "DisplayHardware/GraphicBufferAlloc.h"
		#include "DisplayHardware/HWComposer.h"


		@@ -2548,27 +2549,4 @@ SurfaceFlinger::DisplayDeviceState::DisplayDeviceState(DisplayDevice::DisplayTyp

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

		GraphicBufferAlloc::GraphicBufferAlloc() {}

		GraphicBufferAlloc::~GraphicBufferAlloc() {}

		sp<GraphicBuffer> GraphicBufferAlloc::createGraphicBuffer(uint32_t w, uint32_t h,
		PixelFormat format, uint32_t usage, status_t* error) {
		sp<GraphicBuffer> graphicBuffer(new GraphicBuffer(w, h, format, usage));
		status_t err = graphicBuffer->initCheck();
		*error = err;
		if (err != 0 \|\| graphicBuffer->handle == 0) {
		if (err == NO_MEMORY) {
		GraphicBuffer::dumpAllocationsToSystemLog();
		}
		ALOGE("GraphicBufferAlloc::createGraphicBuffer(w=%d, h=%d) "
		"failed (%s), handle=%p",
		w, h, strerror(-err), graphicBuffer->handle);
		return 0;
		}
		return graphicBuffer;
		}

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

		}; // namespace android