From ad3a13c4c34d300882b8f9a5fdb98ad34a9df55b Mon Sep 17 00:00:00 2001 From: egdaniel Date: Mon, 22 Feb 2016 06:17:52 -0800 Subject: Revert of Add vulkan files into skia repo. (patchset #2 id:20001 of https://codereview.chromium.org/1718693002/ ) Reason for revert: breaking builds Original issue's description: > Add vulkan files into skia repo. This is an incomplete backend with only partial functionality at this time. > > R=robertphillips@google.com > TBR=bsalomon@google.com > > BUG=skia:4955 > GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1718693002 > > Committed: https://skia.googlesource.com/skia/+/48cf268defad66f58f1aa03b4835e5583be96b2f TBR=robertphillips@google.com,bsalomon@google.com,jvanverth@google.com # Skipping CQ checks because original CL landed less than 1 days ago. NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=skia:4955 Review URL: https://codereview.chromium.org/1723503002 --- include/gpu/vk/GrVkInterface.h | 218 ----------------------------------------- 1 file changed, 218 deletions(-) delete mode 100644 include/gpu/vk/GrVkInterface.h (limited to 'include') diff --git a/include/gpu/vk/GrVkInterface.h b/include/gpu/vk/GrVkInterface.h deleted file mode 100644 index 5676b86e3a..0000000000 --- a/include/gpu/vk/GrVkInterface.h +++ /dev/null @@ -1,218 +0,0 @@ -/* - * Copyright 2015 Google Inc. - * - * Use of this source code is governed by a BSD-style license that can be - * found in the LICENSE file. - */ - -#ifndef GrRadInterface_DEFINED -#define GrRadInterface_DEFINED - -#include "SkRefCnt.h" - -#include "vulkan/vulkan.h" - -//////////////////////////////////////////////////////////////////////////////// - -/** - * The default interface is returned by GrVkDefaultInterface. This function's - * implementation is platform-specific. - */ - -struct GrVkInterface; - -/** - * Creates a GrVkInterface. - */ -const GrVkInterface* GrVkCreateInterface(VkInstance instance); - - -/** - * GrContext uses the following interface to make all calls into Vulkan. When a - * GrContext is created it is given a GrVkInterface. All functions that should be - * available based on the Vulkan's version must be non-NULL or GrContext creation - * will fail. This can be tested with the validate() method. - */ -struct SK_API GrVkInterface : public SkRefCnt { -private: - // simple wrapper class that exists only to initialize a pointer to NULL - template class VkPtr { - public: - VkPtr() : fPtr(NULL) {} - VkPtr operator=(FNPTR_TYPE ptr) { fPtr = ptr; return *this; } - operator FNPTR_TYPE() const { return fPtr; } - private: - FNPTR_TYPE fPtr; - }; - - typedef SkRefCnt INHERITED; - -public: - GrVkInterface(); - - // Validates that the GrVkInterface supports its advertised standard. This means the necessary - // function pointers have been initialized for Vulkan version. - bool validate() const; - - /** - * The function pointers are in a struct so that we can have a compiler generated assignment - * operator. - */ - struct Functions { - VkPtr fCreateInstance; - VkPtr fDestroyInstance; - VkPtr fEnumeratePhysicalDevices; - VkPtr fGetPhysicalDeviceFeatures; - VkPtr fGetPhysicalDeviceFormatProperties; - VkPtr fGetPhysicalDeviceImageFormatProperties; - VkPtr fGetPhysicalDeviceProperties; - VkPtr fGetPhysicalDeviceQueueFamilyProperties; - VkPtr fGetPhysicalDeviceMemoryProperties; - VkPtr fCreateDevice; - VkPtr fDestroyDevice; - VkPtr fEnumerateInstanceExtensionProperties; - VkPtr fEnumerateDeviceExtensionProperties; - VkPtr fEnumerateInstanceLayerProperties; - VkPtr fEnumerateDeviceLayerProperties; - VkPtr fGetDeviceQueue; - VkPtr fQueueSubmit; - VkPtr fQueueWaitIdle; - VkPtr fDeviceWaitIdle; - VkPtr fAllocateMemory; - VkPtr fFreeMemory; - VkPtr fMapMemory; - VkPtr fUnmapMemory; - VkPtr fFlushMappedMemoryRanges; - VkPtr fInvalidateMappedMemoryRanges; - VkPtr fGetDeviceMemoryCommitment; - VkPtr fBindBufferMemory; - VkPtr fBindImageMemory; - VkPtr fGetBufferMemoryRequirements; - VkPtr fGetImageMemoryRequirements; - VkPtr fGetImageSparseMemoryRequirements; - VkPtr fGetPhysicalDeviceSparseImageFormatProperties; - VkPtr fQueueBindSparse; - VkPtr fCreateFence; - VkPtr fDestroyFence; - VkPtr fResetFences; - VkPtr fGetFenceStatus; - VkPtr fWaitForFences; - VkPtr fCreateSemaphore; - VkPtr fDestroySemaphore; - VkPtr fCreateEvent; - VkPtr fDestroyEvent; - VkPtr fGetEventStatus; - VkPtr fSetEvent; - VkPtr fResetEvent; - VkPtr fCreateQueryPool; - VkPtr fDestroyQueryPool; - VkPtr fGetQueryPoolResults; - VkPtr fCreateBuffer; - VkPtr fDestroyBuffer; - VkPtr fCreateBufferView; - VkPtr fDestroyBufferView; - VkPtr fCreateImage; - VkPtr fDestroyImage; - VkPtr fGetImageSubresourceLayout; - VkPtr fCreateImageView; - VkPtr fDestroyImageView; - VkPtr fCreateShaderModule; - VkPtr fDestroyShaderModule; - VkPtr fCreatePipelineCache; - VkPtr fDestroyPipelineCache; - VkPtr fGetPipelineCacheData; - VkPtr fMergePipelineCaches; - VkPtr fCreateGraphicsPipelines; - VkPtr fCreateComputePipelines; - VkPtr fDestroyPipeline; - VkPtr fCreatePipelineLayout; - VkPtr fDestroyPipelineLayout; - VkPtr fCreateSampler; - VkPtr fDestroySampler; - VkPtr fCreateDescriptorSetLayout; - VkPtr fDestroyDescriptorSetLayout; - VkPtr fCreateDescriptorPool; - VkPtr fDestroyDescriptorPool; - VkPtr fResetDescriptorPool; - VkPtr fAllocateDescriptorSets; - VkPtr fFreeDescriptorSets; - VkPtr fUpdateDescriptorSets; - VkPtr fCreateFramebuffer; - VkPtr fDestroyFramebuffer; - VkPtr fCreateRenderPass; - VkPtr fDestroyRenderPass; - VkPtr fGetRenderAreaGranularity; - VkPtr fCreateCommandPool; - VkPtr fDestroyCommandPool; - VkPtr fResetCommandPool; - VkPtr fAllocateCommandBuffers; - VkPtr fFreeCommandBuffers; - VkPtr fBeginCommandBuffer; - VkPtr fEndCommandBuffer; - VkPtr fResetCommandBuffer; - VkPtr fCmdBindPipeline; - VkPtr fCmdSetViewport; - VkPtr fCmdSetScissor; - VkPtr fCmdSetLineWidth; - VkPtr fCmdSetDepthBias; - VkPtr fCmdSetBlendConstants; - VkPtr fCmdSetDepthBounds; - VkPtr fCmdSetStencilCompareMask; - VkPtr fCmdSetStencilWriteMask; - VkPtr fCmdSetStencilReference; - VkPtr fCmdBindDescriptorSets; - VkPtr fCmdBindIndexBuffer; - VkPtr fCmdBindVertexBuffers; - VkPtr fCmdDraw; - VkPtr fCmdDrawIndexed; - VkPtr fCmdDrawIndirect; - VkPtr fCmdDrawIndexedIndirect; - VkPtr fCmdDispatch; - VkPtr fCmdDispatchIndirect; - VkPtr fCmdCopyBuffer; - VkPtr fCmdCopyImage; - VkPtr fCmdBlitImage; - VkPtr fCmdCopyBufferToImage; - VkPtr fCmdCopyImageToBuffer; - VkPtr fCmdUpdateBuffer; - VkPtr fCmdFillBuffer; - VkPtr fCmdClearColorImage; - VkPtr fCmdClearDepthStencilImage; - VkPtr fCmdClearAttachments; - VkPtr fCmdResolveImage; - VkPtr fCmdSetEvent; - VkPtr fCmdResetEvent; - VkPtr fCmdWaitEvents; - VkPtr fCmdPipelineBarrier; - VkPtr fCmdBeginQuery; - VkPtr fCmdEndQuery; - VkPtr fCmdResetQueryPool; - VkPtr fCmdWriteTimestamp; - VkPtr fCmdCopyQueryPoolResults; - VkPtr fCmdPushConstants; - VkPtr fCmdBeginRenderPass; - VkPtr fCmdNextSubpass; - VkPtr fCmdEndRenderPass; - VkPtr fCmdExecuteCommands; - VkPtr fDestroySurfaceKHR; - VkPtr fGetPhysicalDeviceSurfaceSupportKHR; - VkPtr fGetPhysicalDeviceSurfaceCapabilitiesKHR; - VkPtr fGetPhysicalDeviceSurfaceFormatsKHR; - VkPtr fGetPhysicalDeviceSurfacePresentModesKHR; - VkPtr fCreateSwapchainKHR; - VkPtr fDestroySwapchainKHR; - VkPtr fGetSwapchainImagesKHR; - VkPtr fAcquireNextImageKHR; - VkPtr fQueuePresentKHR; - VkPtr fGetPhysicalDeviceDisplayPropertiesKHR; - VkPtr fGetPhysicalDeviceDisplayPlanePropertiesKHR; - VkPtr fGetDisplayPlaneSupportedDisplaysKHR; - VkPtr fGetDisplayModePropertiesKHR; - VkPtr fCreateDisplayModeKHR; - VkPtr fGetDisplayPlaneCapabilitiesKHR; - VkPtr fCreateDisplayPlaneSurfaceKHR; - VkPtr fCreateSharedSwapchainsKHR; - } fFunctions; -}; - -#endif -- cgit v1.2.3