Chad Versace [Mon, 13 Jul 2015 18:46:30 +0000 (11:46 -0700)]
vk/vulkan.h: Remove headers for old API versions
Remove the temporary headers for 0.90 and 0.130.
Chad Versace [Sat, 11 Jul 2015 03:06:09 +0000 (20:06 -0700)]
vk/0.130: Bump header version to 0.130
All APIs have been updated. This eliminates the diff between the
work-in-progress header and the 0.130 header.
Chad Versace [Fri, 10 Jul 2015 02:59:44 +0000 (19:59 -0700)]
vk/0.130: Update vkAllocMemory to use VkMemoryType
Chad Versace [Fri, 10 Jul 2015 02:49:19 +0000 (19:49 -0700)]
vk/0.130: Implement vkGetPhysicalDeviceMemoryProperties()
Chad Versace [Fri, 10 Jul 2015 02:38:39 +0000 (19:38 -0700)]
vk/gem: Change signature of anv_gem_get_aperture()
Replace the anv_device parameter with anv_physical_device, because this needs
querying before vkCreateDevice.
Chad Versace [Thu, 9 Jul 2015 23:31:39 +0000 (16:31 -0700)]
vk/device: Add member anv_physical_device::fd
During anv_physical_device_init(), we opend the DRM device to do some
queries, then promptly closed it. Now we keep it open for the lifetime
of the anv_physical_device so that we can query it some more during
vkGetPhysicalDevice*Properties() [which will happen in follow-up
commits].
Chad Versace [Thu, 9 Jul 2015 23:22:18 +0000 (16:22 -0700)]
vk/device: Add func anv_physical_device_finish()
Because in a follow-up patch I need to do some non-trival teardown on
anv_physical_device. Currently, however, anv_physical_device_finish() is
currently a no-op that's just called in the right place.
Also, rename function fill_physical_device -> anv_physical_device_init
for symmetry.
Jason Ekstrand [Fri, 10 Jul 2015 19:33:04 +0000 (12:33 -0700)]
vk/device: Add an explicit destructor for RenderPass
Jason Ekstrand [Fri, 10 Jul 2015 19:30:58 +0000 (12:30 -0700)]
vk/image: Add an explicit DestroyImage function
Jason Ekstrand [Fri, 10 Jul 2015 19:25:30 +0000 (12:25 -0700)]
vk/image: Add explicit constructors for buffer/image view types
Jason Ekstrand [Fri, 10 Jul 2015 17:59:09 +0000 (10:59 -0700)]
nir: Add C++ versions of NIR_(SRC|DEST)_INIT
Chad Versace [Fri, 10 Jul 2015 01:46:21 +0000 (18:46 -0700)]
mesa: Fix generation of git_sha1.h.tmp for gitlinks
Don't assume that $(top_srcdir)/.git is a directory. It may be a
gitlink file [1] if $(top_srcdir) is a submodule checkout or a linked
worktree [2].
[1] A "gitlink" is a text file that specifies the real location of
the gitdir.
[2] Linked worktrees are a new feature in Git 2.5.
Cc: "10.6, 10.5" <mesa-stable@lists.freedesktop.org>
Reviewed-by: Iago Toral Quiroga <itoral@igalia.com>
(cherry picked from commit
75784243df1f5bb0652fb243b37d69f36d493a86)
Jason Ekstrand [Fri, 10 Jul 2015 03:32:44 +0000 (20:32 -0700)]
vk/query.c: Use the casting functions
Jason Ekstrand [Fri, 10 Jul 2015 03:28:08 +0000 (20:28 -0700)]
vk/pipeline.c: Use the casting functions
Jason Ekstrand [Fri, 10 Jul 2015 03:24:17 +0000 (20:24 -0700)]
vk/formats.c: Use the casting functions
Jason Ekstrand [Fri, 10 Jul 2015 03:24:07 +0000 (20:24 -0700)]
vk/image.c: Use the casting functions
Jason Ekstrand [Fri, 10 Jul 2015 03:23:46 +0000 (20:23 -0700)]
vk/device.c: One more use of a casting function
Jason Ekstrand [Fri, 10 Jul 2015 03:16:13 +0000 (20:16 -0700)]
vk/meta.c: Use the casting functions
Jason Ekstrand [Fri, 10 Jul 2015 01:59:05 +0000 (18:59 -0700)]
vk: Fix the build
Jason Ekstrand [Fri, 10 Jul 2015 01:41:27 +0000 (18:41 -0700)]
device.c: Use the cast helpers a bunch of places
Jason Ekstrand [Fri, 10 Jul 2015 01:41:27 +0000 (18:41 -0700)]
device.c: Use the cast helpers
Jason Ekstrand [Fri, 10 Jul 2015 01:35:22 +0000 (18:35 -0700)]
vk/private.h: Add a bunch of static inline casting functions
We will need these as soon as we turn on type saftey. We might as well
define and start using them now rather than later.
Jason Ekstrand [Fri, 10 Jul 2015 01:20:28 +0000 (18:20 -0700)]
vk/device.c: Fix whitespace issues
Jason Ekstrand [Fri, 10 Jul 2015 01:20:10 +0000 (18:20 -0700)]
vk/device.c: Use ANV_FROM_HANDLE a bunch of places
Jason Ekstrand [Thu, 9 Jul 2015 23:21:31 +0000 (16:21 -0700)]
vk/vulkan.h: Add the pEnabledFeatures field to DeviceCreateInfo
Jason Ekstrand [Thu, 9 Jul 2015 23:19:52 +0000 (16:19 -0700)]
vk/vulkan.h: Change the MsCreateInfo structure to the 130 version
We do nothing with it at the moment, so this is a no-op.
Jason Ekstrand [Thu, 9 Jul 2015 23:14:31 +0000 (16:14 -0700)]
vk: Remove the old GetPhysicalDeviceInfo call
Jason Ekstrand [Thu, 9 Jul 2015 23:11:24 +0000 (16:11 -0700)]
vk: Add the new PhysicalDeviceQueue queries
Jason Ekstrand [Thu, 9 Jul 2015 22:53:03 +0000 (15:53 -0700)]
vk: Support GetPhysicalDeviceProperties
Jason Ekstrand [Thu, 9 Jul 2015 22:38:30 +0000 (15:38 -0700)]
vk: Add support for GetPhysicalDeviceLimits
Jason Ekstrand [Thu, 9 Jul 2015 20:54:08 +0000 (13:54 -0700)]
vk: Add GetPhysicalDeviceFeatures
Chad Versace [Thu, 9 Jul 2015 22:51:06 +0000 (15:51 -0700)]
vk/device: Fix vkEnumeratePhysicalDevices()
The Vulkan spec says that pPhysicalDeviceCount is an out parameter if
pPhysicalDevices is NULL; otherwise it's an inout parameter.
Mesa incorrectly treated it unconditionally as an inout parameter, which
could have lead to reading unitialized data.
Chad Versace [Thu, 9 Jul 2015 22:38:58 +0000 (15:38 -0700)]
vk/device: Move device enumeration to vkEnumeratePhysicalDevices()
Don't enumerate devices in vkCreateInstance(). That's where global,
device-independent initialization should happen. Move device enumeration
to the more logical location, vkEnumeratePhysicalDevices().
Chad Versace [Thu, 9 Jul 2015 22:23:25 +0000 (15:23 -0700)]
vk/device: Be consistent about path to DRM device
Function fill_physical_device() has a 'path' parameter, and struct
anv_physical_device has a 'path' member. Sometimes these are used;
sometimes hardcoded "/dev/dri/renderD128" is used instead.
Be consistent. Hardcode "/dev/dri/renderD128" in exactly one location,
during initialization of the physical device.
Connor Abbott [Thu, 9 Jul 2015 18:29:23 +0000 (14:29 -0400)]
vk/compiler: create an empty parameters list
Prevents problems when initializing the sanity_param_count.
Connor Abbott [Thu, 9 Jul 2015 18:28:39 +0000 (14:28 -0400)]
nir/spirv: fix wrong writemask for ALU operations
Connor Abbott [Thu, 9 Jul 2015 02:01:33 +0000 (22:01 -0400)]
nir/spirv: fix memory context for builtin variable
Fixes valgrind errors with func.depthstencil.basic.
Connor Abbott [Thu, 9 Jul 2015 01:50:16 +0000 (21:50 -0400)]
nir/spirv: zero out value array
Before values are pushed or annotated with a name, decoration, etc.,
they need to have an invalid type, NULL name, NULL decoration, etc.
ralloc zero's everything by accident, so this wasn't an issue in
practice, but we should be explicitly zero'ing it.
Connor Abbott [Thu, 9 Jul 2015 01:48:57 +0000 (21:48 -0400)]
vk/compiler: create the right kind of program struct
This fixes Valgrind errors and gets all the tests to pass with
--use-spir-v.
Connor Abbott [Thu, 9 Jul 2015 01:47:43 +0000 (21:47 -0400)]
vk/compiler: mark inputs/outputs as read/written
This doesn't handle inputs and outputs larger than a vec4, but we plan
to add a varyiing splitting/packing pass to handle those anyways.
Jason Ekstrand [Thu, 9 Jul 2015 00:45:50 +0000 (17:45 -0700)]
vk/vulkan.h: Copy the VkStructureType enum from version 130
We now have the exact same structs which require pType.
Jason Ekstrand [Thu, 9 Jul 2015 00:29:49 +0000 (17:29 -0700)]
vk: Move to the new pipeline creation API's
Chad Versace [Wed, 8 Jul 2015 21:39:05 +0000 (14:39 -0700)]
vk/0.130: Remove VkImageViewCreateInfo::minLod
It's now set solely through VkSampler.
Jason Ekstrand [Wed, 8 Jul 2015 21:37:30 +0000 (14:37 -0700)]
vk/vulkan.h: Move renderPassContinue from GraphicsBeginInfo to BeginInfo
Jason Ekstrand [Wed, 8 Jul 2015 21:24:56 +0000 (14:24 -0700)]
vk/vulkan.h: Update to the new UpdateDescriptorSets api
Jason Ekstrand [Wed, 8 Jul 2015 21:24:12 +0000 (14:24 -0700)]
vk: Add a macro for creating anv variables from vulkan handles
This is very helpful for doing the mass bunch of casts at the top of a
function. It will also be invaluable when we get type saftey in the API.
Chad Versace [Wed, 8 Jul 2015 19:53:49 +0000 (12:53 -0700)]
vk/0.130 Update VkObjectType values
Don't import any new enum tokens from the 0.130 header. Just update the
values of existing enums. This reduces the diff by about 16 lines.
Chad Versace [Wed, 8 Jul 2015 19:51:46 +0000 (12:51 -0700)]
vk/0.130: Remove VkDescriptorUpdateMode
Nowhere used.
Chad Versace [Wed, 8 Jul 2015 19:49:15 +0000 (12:49 -0700)]
vk/0.130: Remove VK_DEVICE_CREATE_MULTI_DEVICE_IQ_MATCH_BIT
Chad Versace [Wed, 8 Jul 2015 19:46:35 +0000 (12:46 -0700)]
vk/0.130: Update vkCmdBlitImage signature
Add VkTexFilter param. Ignored for now.
Jason Ekstrand [Wed, 8 Jul 2015 18:51:12 +0000 (11:51 -0700)]
vk/vulkan.h: Add packing parameters to BufferImageCopy
Chad Versace [Wed, 8 Jul 2015 18:49:43 +0000 (11:49 -0700)]
vk/0.130: Remove msaa members of VkDepthStencilViewCreateInfo
Jason Ekstrand [Wed, 8 Jul 2015 18:44:52 +0000 (11:44 -0700)]
vk/vulkan.h: Move over to the new border color enums
Jason Ekstrand [Wed, 8 Jul 2015 18:16:45 +0000 (11:16 -0700)]
vk/vulkan.h: Move VkFormatProperties
Jason Ekstrand [Wed, 8 Jul 2015 17:57:13 +0000 (10:57 -0700)]
vk/vulkan.h: Add RenderPassBeginContents
Jason Ekstrand [Wed, 8 Jul 2015 17:53:32 +0000 (10:53 -0700)]
vk/vulkan.h: Add command buffer levels
Jason Ekstrand [Wed, 8 Jul 2015 17:49:43 +0000 (10:49 -0700)]
vk/vulkan.h: Import the VkPipeEvent enum from 130
Now, VkPipeEventFlags is back in sync with VkPipeEvent
Jason Ekstrand [Wed, 8 Jul 2015 17:39:31 +0000 (10:39 -0700)]
vk/vulkan.h: Remove VkFormatInfoType
Jason Ekstrand [Wed, 8 Jul 2015 17:38:07 +0000 (10:38 -0700)]
vk/vulkan.h: Update extension handling to rev 130
Jason Ekstrand [Wed, 8 Jul 2015 16:34:47 +0000 (09:34 -0700)]
vk/vulkan.h: Move format quering to the physical device
Jason Ekstrand [Wed, 8 Jul 2015 16:25:13 +0000 (09:25 -0700)]
vk/vulkan.h: Remove some peer opening structs and STRUCTURE_TYPE enums
Jason Ekstrand [Wed, 8 Jul 2015 16:23:29 +0000 (09:23 -0700)]
vk: Add a copy of the v90 header.
Jason Ekstrand [Wed, 8 Jul 2015 16:18:09 +0000 (09:18 -0700)]
vk/vulkan.h: Remove an unneeded comment
Jason Ekstrand [Wed, 8 Jul 2015 16:16:48 +0000 (09:16 -0700)]
vk/vulkan.h: Remove the MemoryRange stubs and add sparse stubs
Jason Ekstrand [Wed, 8 Jul 2015 16:04:16 +0000 (09:04 -0700)]
vk/vulkan.h: Switch BindObjectMemory to a device function and remove the index
Jason Ekstrand [Wed, 8 Jul 2015 01:51:53 +0000 (18:51 -0700)]
vk/vulkan.h: Switch to the split ProcAddr functions in 130
Jason Ekstrand [Wed, 8 Jul 2015 01:20:18 +0000 (18:20 -0700)]
vk/vulkan.h: Switch from GetImageSubresourceInfo to GetImageSubresourceLayout
Jason Ekstrand [Wed, 8 Jul 2015 01:16:42 +0000 (18:16 -0700)]
vk/vulkan.h: Switch from GetObjectInfo to GetMemoryRequirements
Jason Ekstrand [Wed, 8 Jul 2015 00:22:29 +0000 (17:22 -0700)]
vk: Update memory flushing functions to 130
This involves updating the prototype for FlushMappedMemory, adding
InvalidateMappedMemoryRanges, and removing PinSystemMemory.
Jason Ekstrand [Wed, 8 Jul 2015 00:18:00 +0000 (17:18 -0700)]
vk/vulkan.h: Constify the pFences parameter to ResetFences
Jason Ekstrand [Wed, 8 Jul 2015 00:13:05 +0000 (17:13 -0700)]
vk/vulkan.h: Move the definitions of Create(Framebuffer|RenderPass)
This better matches the 130 header.
Jason Ekstrand [Wed, 8 Jul 2015 00:11:35 +0000 (17:11 -0700)]
vk: Implement the GetRenderAreaGranularity function
At the moment, we're just going to scissor clears so a granularity of 1x1
is all we need.
Jason Ekstrand [Wed, 8 Jul 2015 00:06:10 +0000 (17:06 -0700)]
vk/vulkan.h: Add a PipelineLayout parameter to BindDescriptorSets
Jason Ekstrand [Tue, 7 Jul 2015 23:49:01 +0000 (16:49 -0700)]
vk/vulkan.h: Add a compareEnable parameter to SamplerCreateInfo
Our hardware doesn't actually need this, so adding it is a no-op.
Jason Ekstrand [Tue, 7 Jul 2015 23:42:42 +0000 (16:42 -0700)]
vk/vulkan.h: Remove initialCount from SemaphoreCreateInfo
Jason Ekstrand [Tue, 7 Jul 2015 23:37:43 +0000 (16:37 -0700)]
vk/vulkan.h: Update clear color handling to 130
Jason Ekstrand [Tue, 7 Jul 2015 23:27:06 +0000 (16:27 -0700)]
meta: Use the VkClearColorValue structure for the color attribute
Jason Ekstrand [Tue, 7 Jul 2015 23:22:23 +0000 (16:22 -0700)]
vk/vulkan.h: Remove the pass argument from EndRenderPass
Jason Ekstrand [Tue, 7 Jul 2015 23:15:55 +0000 (16:15 -0700)]
vk/vulkan.h: Rename VertexInputStateInfo to VertexInputStateCreateInfo
Jason Ekstrand [Tue, 7 Jul 2015 22:57:03 +0000 (15:57 -0700)]
vk/vulkan.h: Remove programPointSize
Instead, we auto-detect whether or not your shader writes gl_PointSize. If
it does, we use 1.0, otherwise we take it from the shader.
Chad Versace [Tue, 7 Jul 2015 22:56:12 +0000 (15:56 -0700)]
vk/0.130: Stub vkCmdClear*Attachment() funcs
vkCmdClearColorAttachment
vkCmdClearDepthStencilAttachment
Chad Versace [Tue, 7 Jul 2015 22:57:17 +0000 (15:57 -0700)]
vk/0.130: Define enum VkImageAspectFlagBits
Chad Versace [Tue, 7 Jul 2015 22:55:53 +0000 (15:55 -0700)]
vk/0.130: Define VkRect3D
Chad Versace [Tue, 7 Jul 2015 22:53:35 +0000 (15:53 -0700)]
vk/0.130: Update name of vkCmdClearDepthStencilImage()
Chad Versace [Tue, 7 Jul 2015 22:51:55 +0000 (15:51 -0700)]
vk/0.130: Stub vkCmdExecuteCommands()
Chad Versace [Tue, 7 Jul 2015 22:49:57 +0000 (15:49 -0700)]
vk/0.130: Update vkCmdWaitEvents() signature
Chad Versace [Tue, 7 Jul 2015 22:47:24 +0000 (15:47 -0700)]
vk: Remove unused 'v' param from stub() macro
Chad Versace [Tue, 7 Jul 2015 22:46:19 +0000 (15:46 -0700)]
vk: Stub vkCmdPushConstants() from 0.130 header
Chad Versace [Tue, 7 Jul 2015 22:42:38 +0000 (15:42 -0700)]
vk: Update vkCmdPipelineBarrier to 0.130 header
Chad Versace [Tue, 7 Jul 2015 22:42:04 +0000 (15:42 -0700)]
vk: Add func anv_clear_mask()
A little helper func for inspecting and clearing bitmasks.
Jason Ekstrand [Tue, 7 Jul 2015 21:42:47 +0000 (14:42 -0700)]
vk/vulkan.h: Remove some unused fields.
In particular, the following are removed:
- disableVertexReuse
- clipOrigin
- depthMode
- pointOrigin
- provokingVertex
Jason Ekstrand [Tue, 7 Jul 2015 22:11:56 +0000 (15:11 -0700)]
vk/vulkan.h: Remove the explicit primitive restart index
Unfortunately, this requires some non-trivial changes to the driver. Now
that the primitive restart index isn't given explicitly by the client, we
always use ~0 for everything like D3D does. Unfortunately, our hardware is
awesome and a 32-bit version of ~0 doesn't match any 16-bit values. This
means, we have to set it to either UINT16_MAX or UINT32_MAX depending on
the size of the index type. Since we get the index type from
CmdBindIndexBuffer and the rest of the VF packet from the pipeline, we need
to lazy-emit the VF packet.
Chad Versace [Tue, 7 Jul 2015 22:16:13 +0000 (15:16 -0700)]
vk: Delete some comments not present in 0.130 header
Deleting the comments reduces diff noise.
Chad Versace [Tue, 7 Jul 2015 22:13:01 +0000 (15:13 -0700)]
vk: Pull in remaining 0.130 handle types
This pulls in the definition of VkShaderModule and VkPipelineCache,
which nowhere used yet.
Chad Versace [Tue, 7 Jul 2015 22:10:34 +0000 (15:10 -0700)]
vk: Pull in #defines from 0.130 header
Despite not being used yet, pulling in the macros does diminish the
header diff.
Jason Ekstrand [Tue, 7 Jul 2015 19:37:54 +0000 (12:37 -0700)]
vk/vulkan.h: Rename (min|max)Depth to (min|max)DepthBounds
Jason Ekstrand [Tue, 7 Jul 2015 19:35:32 +0000 (12:35 -0700)]
vk/vulkan.h: Remove client-settable pointSize from DynamicRsState
Jason Ekstrand [Tue, 7 Jul 2015 18:26:26 +0000 (11:26 -0700)]
vk/vulkan.h: Remove UINT8 index buffers
Jason Ekstrand [Tue, 7 Jul 2015 17:37:14 +0000 (10:37 -0700)]
vk/vulkan.h: Re-order the object declarations
Kristian Høgsberg Kristensen [Tue, 7 Jul 2015 05:21:51 +0000 (22:21 -0700)]
vk: Emit 3DSTATE_SAMPLE_MASK
This was missing and was causing the driver to not work with
execlists. Presumably we get a different initial hw context with
execlists enabled, that has sample mask 0 initially.
Set this to 0xffff for now. When we add MS support, we need to take the
value from VkPipelineMsStateCreateInfo::sampleMask.