92bdb5a389
This CL adds GRSurface::Create() and dtor for managing the allocated memory in GRSurface class. It also adds GRSurface::data() that hides the underlying implementation, with both of const and non-const overloads. This allows `const GRSurface&` to be more useful - previously it only ensured a const member variable of `data`, instead of a read-only buffer it points to. It also marks the parameters in gr_texticon() and gr_blit() as const, as they're incoming source that shouldn't be altered. It corrects the type of gr_draw, which is the sink to be painted on (an earlier attempt was made in [1], but didn't get the full picture correctly). [1] https://android-review.googlesource.com/c/platform/bootable/recovery/+/704757/ Test: mmma -j bootable/recovery Test: recovery_unit_test on marlin Test: Run graphics test on marlin (fbdev). Test: Run graphics test on blueline (drm). Change-Id: I7904df084cd6c08fa04a9da97d01b4b1a6e3a20c
65 lines
1.5 KiB
C++
65 lines
1.5 KiB
C++
/*
|
|
* Copyright (C) 2017 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.
|
|
*/
|
|
|
|
#pragma once
|
|
|
|
#include <stdint.h>
|
|
|
|
#include <adf/adf.h>
|
|
|
|
#include "graphics.h"
|
|
#include "minui/minui.h"
|
|
|
|
class GRSurfaceAdf : public GRSurface {
|
|
public:
|
|
uint8_t* data() override {
|
|
return mmapped_buffer_;
|
|
}
|
|
|
|
private:
|
|
friend class MinuiBackendAdf;
|
|
|
|
int fence_fd;
|
|
int fd;
|
|
__u32 offset;
|
|
__u32 pitch;
|
|
|
|
uint8_t* mmapped_buffer_{ nullptr };
|
|
};
|
|
|
|
class MinuiBackendAdf : public MinuiBackend {
|
|
public:
|
|
GRSurface* Init() override;
|
|
GRSurface* Flip() override;
|
|
void Blank(bool) override;
|
|
~MinuiBackendAdf() override;
|
|
MinuiBackendAdf();
|
|
|
|
private:
|
|
int SurfaceInit(const drm_mode_modeinfo* mode, GRSurfaceAdf* surf);
|
|
int InterfaceInit();
|
|
int DeviceInit(adf_device* dev);
|
|
void SurfaceDestroy(GRSurfaceAdf* surf);
|
|
void Sync(GRSurfaceAdf* surf);
|
|
|
|
int intf_fd;
|
|
adf_id_t eng_id;
|
|
__u32 format;
|
|
adf_device dev;
|
|
unsigned int current_surface;
|
|
unsigned int n_surfaces;
|
|
GRSurfaceAdf surfaces[2];
|
|
};
|