fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-06 02:58:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

gfxstream: nuke HOST_BUILD

Browse source 
The host build has been deprecated in favor of end2end tests.

Reviewed-by: Aaron Ruby <aruby@blackberry.com>
Acked-by: Yonggang Luo <luoyonggang@gmail.com>
Acked-by: Adam Jackson <ajax@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/27246>
This commit is contained in:
Gurchetan Singh 2024-01-22 10:19:40 -08:00 • committed by Marge Bot
parent 7d85b542e8
commit c5ced9e430
6 changed files with 5 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/gfxstream/guest/GoldfishAddressSpace/AddressSpaceStream.cpp
View file

@ -592,7 +592,7 @@ int AddressSpaceStream::type1Write(uint32_t bufferOffset, size_t size) {
}
void AddressSpaceStream::backoff() {
#if defined(HOST_BUILD) || defined(__APPLE__) || defined(__MACOSX) || defined(__Fuchsia__) || defined(__linux__)
#if defined(__APPLE__) || defined(__MACOSX) || defined(__Fuchsia__) || defined(__linux__)
static const uint32_t kBackoffItersThreshold = 50000000;
static const uint32_t kBackoffFactorDoublingIncrement = 50000000;
#elif defined(__ANDROID__)

4
src/gfxstream/guest/GoldfishAddressSpace/goldfish_address_space.cpp
View file

@ -13,9 +13,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
#if defined(HOST_BUILD)
#include "goldfish_address_space_host.impl"
#elif defined(__Fuchsia__)
#if defined(__Fuchsia__)
#include "goldfish_address_space_fuchsia.impl"
#else
#include "goldfish_address_space_android.impl"

2
src/gfxstream/guest/GoldfishAddressSpace/include/address_space.h
View file

@ -19,8 +19,6 @@
#if defined(__Fuchsia__)
typedef void* address_space_handle_t;
#elif defined(HOST_BUILD)
typedef uint32_t address_space_handle_t;
#else
typedef int address_space_handle_t;
#endif

10
src/gfxstream/guest/GoldfishAddressSpace/include/goldfish_address_space.h
View file

@ -27,16 +27,6 @@
class GoldfishAddressSpaceBlock;
class GoldfishAddressSpaceHostMemoryAllocator;
#ifdef HOST_BUILD
namespace android {
class HostAddressSpaceDevice;
} // namespace android
#endif
using GoldfishAddressSpaceSubdeviceType = AddressSpaceSubdeviceType;
class GoldfishAddressSpaceBlockProvider {

5
src/gfxstream/guest/vulkan_enc/AndroidHardwareBuffer.cpp
View file

@ -14,12 +14,10 @@
// limitations under the License.
#include "AndroidHardwareBuffer.h"
#if !defined(HOST_BUILD)
#if defined(__ANDROID__) || defined(__linux__)
#include <drm_fourcc.h>
#define DRM_FORMAT_YVU420_ANDROID fourcc_code('9', '9', '9', '7')
#endif
#endif
#include <assert.h>
@ -135,7 +133,6 @@ VkResult getAndroidHardwareBufferPropertiesANDROID(
ahbFormatProps->samplerYcbcrConversionComponents.b = VK_COMPONENT_SWIZZLE_IDENTITY;
ahbFormatProps->samplerYcbcrConversionComponents.a = VK_COMPONENT_SWIZZLE_IDENTITY;
#if !defined(HOST_BUILD)
#if defined(__ANDROID__) || defined(__linux__)
if (android_format_is_yuv(format)) {
uint32_t drmFormat = grallocHelper->getFormatDrmFourcc(buffer);
@ -193,8 +190,6 @@ VkResult getAndroidHardwareBufferPropertiesANDROID(
}
}
#endif
#endif
ahbFormatProps->suggestedYcbcrModel = android_format_is_yuv(format)
? VK_SAMPLER_YCBCR_MODEL_CONVERSION_YCBCR_601
: VK_SAMPLER_YCBCR_MODEL_CONVERSION_RGB_IDENTITY;

16
src/gfxstream/guest/vulkan_enc/ResourceTracker.cpp
View file

@ -50,22 +50,12 @@
#include <sys/mman.h>
#include <sys/syscall.h>
#ifdef HOST_BUILD
#include "android/utils/tempfile.h"
#endif
static inline int inline_memfd_create(const char* name, unsigned int flags) {
#ifdef HOST_BUILD
TempFile* tmpFile = tempfile_create();
return open(tempfile_path(tmpFile), O_RDWR);
// TODO: Windows is not suppose to support VkSemaphoreGetFdInfoKHR
#elif !defined(__ANDROID__)
(void)name;
(void)flags;
ALOGE("Not yet supported.");
abort();
#else
#if defined(__ANDROID__)
return syscall(SYS_memfd_create, name, flags);
#else
return -1;
#endif
}