Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3cde3bdf authored by Jesse Hall's avatar Jesse Hall Committed by android-build-merger
Browse files

Merge "vkinfo: Fix bytes -> megabytes conversion" into nyc-dev 

am: e59624db

* commit 'e59624db':
  vkinfo: Fix bytes -> megabytes conversion
parents 9eadec75 e59624db

vulkan/nulldrv/null_driver.cpp

+1 −1
Original line number Diff line number Diff line
@@ -89,7 +89,7 @@ enum Enum { 
};

}  // namespace HandleType



const VkDeviceSize kMaxDeviceMemory = VkDeviceSize(INTPTR_MAX) + 1;

const VkDeviceSize kMaxDeviceMemory = 0x10000000;  // 256 MiB, arbitrary



}  // anonymous namespace

vulkan/tools/vkinfo.cpp

+1 −1
Original line number Diff line number Diff line
@@ -342,7 +342,7 @@ void PrintGpuInfo(const GpuInfo& info, const Options& options, size_t indent) { 
            strbuf << "DEVICE_LOCAL";

        printf("%sHeap %u: %" PRIu64 " MiB (0x%" PRIx64 " B) %s\n",

               Indent(indent + 1), heap,

               info.memory.memoryHeaps[heap].size / 0x1000000,

               info.memory.memoryHeaps[heap].size / 0x100000,

               info.memory.memoryHeaps[heap].size, strbuf.str().c_str());

        strbuf.str(std::string());