Kristian Høgsberg Kristensen [Thu, 11 Jun 2015 05:06:46 +0000 (22:06 -0700)]
vk: Regenerate headers with __gen_validate_value()
Jason Ekstrand [Thu, 11 Jun 2015 16:11:14 +0000 (09:11 -0700)]
vk/formats: Refactor format properties code
Along with the refactor, we now do the right thing when we hit an
unsupported format: Set the flags to 0 and return VK_SUCCESS.
Jason Ekstrand [Thu, 11 Jun 2015 04:04:51 +0000 (21:04 -0700)]
vk/image: Add a bunch of asserts
Jason Ekstrand [Thu, 11 Jun 2015 04:04:13 +0000 (21:04 -0700)]
vk: Add a couple vk_error calls
Jason Ekstrand [Thu, 11 Jun 2015 04:03:50 +0000 (21:03 -0700)]
vk/private: Add a non-fatal assert
Jason Ekstrand [Wed, 10 Jun 2015 23:37:31 +0000 (16:37 -0700)]
vk/cmd: Add an initial implementation of PipelineBarrier
We may want to do something more inteligent here later such as actually
handling image layout transitions. However, this should do for now.
Jason Ekstrand [Wed, 10 Jun 2015 19:43:02 +0000 (12:43 -0700)]
vk/emit: Use valgrind to validate every packed field
Jason Ekstrand [Wed, 10 Jun 2015 04:36:12 +0000 (21:36 -0700)]
vk: Add valgrind checks in various emit functions
The check in batch_bo_finish should catch any undefined values in the batch
but isn't that great for debugging. The checks in the various emit
functions will help get better granularity.
Jason Ekstrand [Wed, 10 Jun 2015 04:13:36 +0000 (21:13 -0700)]
vk: Move the valgrind include and VG() macro to private.h
Chad Versace [Tue, 9 Jun 2015 22:01:18 +0000 (15:01 -0700)]
vk/image: Don't double-allocate stencil buffers
If the main surface has format S8_UINT, then don't allocate the
auxiliary stencil surface.
Chad Versace [Tue, 9 Jun 2015 21:56:58 +0000 (14:56 -0700)]
vk/image: Teach anv_image_choose_tile_mode about WMAJOR
Chad Versace [Tue, 9 Jun 2015 21:54:53 +0000 (14:54 -0700)]
vk/util: Add anv_abortf(), anv_abortfv()
Convenience functions to print an error message then abort.
Chad Versace [Tue, 9 Jun 2015 21:54:40 +0000 (14:54 -0700)]
vk: Define anv_noreturn macro
Chad Versace [Tue, 9 Jun 2015 21:33:05 +0000 (14:33 -0700)]
vk/image: Factor tile mode selection into separate function
Because it will eventually need to get smarter.
Jason Ekstrand [Tue, 9 Jun 2015 23:28:46 +0000 (16:28 -0700)]
vk/device: Actually allow destruction
Jason Ekstrand [Tue, 9 Jun 2015 23:27:55 +0000 (16:27 -0700)]
vk/cmd_buffer: Properly initialize/reset dynamic states
Jason Ekstrand [Tue, 9 Jun 2015 23:26:55 +0000 (16:26 -0700)]
vk/pipeline: Zero out the depth-stencil state when not in use
Jason Ekstrand [Tue, 9 Jun 2015 23:01:56 +0000 (16:01 -0700)]
vk/device: Use anv_CreateDynamicViewportState instead of the vk one
Jason Ekstrand [Tue, 9 Jun 2015 22:53:10 +0000 (15:53 -0700)]
vk/device: Dedent the vkCreateDynamicViewportState call
Chad Versace [Tue, 9 Jun 2015 21:46:18 +0000 (14:46 -0700)]
vk/util: Annotate anv_finishme() as printflike
Chad Versace [Tue, 9 Jun 2015 21:45:58 +0000 (14:45 -0700)]
vk: Define anv_printflike() macro
Chad Versace [Tue, 9 Jun 2015 21:03:44 +0000 (14:03 -0700)]
vk/image: Stop hardcoding alignment of stencil surfaces
Look up the alignment from anv_tile_info_table.
Chad Versace [Tue, 9 Jun 2015 20:29:08 +0000 (13:29 -0700)]
vk/image: Rewrite tile info table
- Reduce the number of table lookups in anv_image_create from 4 to 1.
- Add field for surface alignment.
- Shorten field names tile_width, tile_height -> width, height.
Chad Versace [Tue, 9 Jun 2015 20:13:32 +0000 (13:13 -0700)]
vk/image: Delete an old comment
Jason Ekstrand [Tue, 9 Jun 2015 19:35:21 +0000 (12:35 -0700)]
vk/compiler: Free the GL errors data
Jason Ekstrand [Tue, 9 Jun 2015 19:29:37 +0000 (12:29 -0700)]
vk/compiler: Free more of prog_data when tearing down a pipeline
Jason Ekstrand [Tue, 9 Jun 2015 19:28:58 +0000 (12:28 -0700)]
vk/queue: Embed the queue in and allocate it with the device
Jason Ekstrand [Tue, 9 Jun 2015 18:41:31 +0000 (11:41 -0700)]
vk/device: Free border color states when we have valgrind
Jason Ekstrand [Tue, 9 Jun 2015 18:40:22 +0000 (11:40 -0700)]
vk/device: Destroy all batch buffers
Due to a copy+paste error, we were destroying all but the first batch or
surface state buffer. Now we destroy them all.
Jason Ekstrand [Tue, 9 Jun 2015 18:08:51 +0000 (11:08 -0700)]
vk/meta: Clean up temporary objects
Jason Ekstrand [Tue, 9 Jun 2015 18:08:03 +0000 (11:08 -0700)]
vk/surface_view: Add a destructor
Chad Versace [Tue, 9 Jun 2015 19:11:46 +0000 (12:11 -0700)]
vk/image: Add anv_image::h_align,v_align
Use the new fields to compute RENDER_SURFACE_STATE.Surface*Alignment.
We still hardcode them to 4, though.
Jason Ekstrand [Tue, 9 Jun 2015 00:46:32 +0000 (17:46 -0700)]
vk/allocator: Remove the concept of a slave block pool
This reverts commit
d24f8245db3418d8d146f373e085780d2217335c.
Jason Ekstrand [Tue, 9 Jun 2015 00:45:57 +0000 (17:45 -0700)]
vk/device: Remove the binding table pools/streams
Jason Ekstrand [Mon, 8 Jun 2015 21:27:02 +0000 (14:27 -0700)]
vk/pipeline: Move freeing the program stream to pipeline.c
It's created in pipeline.c so we should free it there.
Jason Ekstrand [Mon, 8 Jun 2015 20:52:34 +0000 (13:52 -0700)]
vk/pipeline: Don't destroy the program stream
It's freed in compiler.cpp and we don't want to free it twice.
Jason Ekstrand [Mon, 8 Jun 2015 20:50:52 +0000 (13:50 -0700)]
vk/allocator: Make the use of NULL_BLOCK in state_stream_finish explicit
Kristian Høgsberg Kristensen [Fri, 5 Jun 2015 18:51:30 +0000 (11:51 -0700)]
vk: Quiet a few warnings
Kristian Høgsberg Kristensen [Thu, 4 Jun 2015 06:03:29 +0000 (23:03 -0700)]
vk: Create a minimal context for the compiler
This avoids the full brw context initialization and just sets up context
constants, initializes extensions and sets a few driver vfuncs for the
front-end GLSL compiler.
Jason Ekstrand [Sat, 6 Jun 2015 00:14:41 +0000 (17:14 -0700)]
vk/cmd_buffer: Use the dynamic state stream in emit_dynamic and merge_dynamic
Jason Ekstrand [Sat, 6 Jun 2015 00:26:01 +0000 (17:26 -0700)]
vk/device: Use a 64-byte alignment for CC state
Jason Ekstrand [Sat, 6 Jun 2015 00:14:57 +0000 (17:14 -0700)]
vk/pipeline: Actually free the program stream and dynamic pool
Jason Ekstrand [Sat, 6 Jun 2015 00:11:49 +0000 (17:11 -0700)]
vk/allocator: Avoid double-free in the bo pool
Jason Ekstrand [Fri, 5 Jun 2015 23:41:49 +0000 (16:41 -0700)]
vk/gem: Call VALGRIND_FREELIKE_BLOCK before unmapping
Chad Versace [Thu, 4 Jun 2015 21:31:53 +0000 (14:31 -0700)]
vk: Fix 2 incorrect typecasts
The compiler didn't find the cast errors because all Vulkan types are
just integers.
Chad Versace [Thu, 4 Jun 2015 21:26:03 +0000 (14:26 -0700)]
vk: Make `make clean` remove generated spirv headers
Jason Ekstrand [Thu, 4 Jun 2015 16:12:37 +0000 (09:12 -0700)]
vk/allocator: Remove an unneeded VG() wrapper
Jason Ekstrand [Thu, 4 Jun 2015 16:06:59 +0000 (09:06 -0700)]
vk/device: Dissalow device destruction
Chad Versace [Thu, 4 Jun 2015 16:01:30 +0000 (09:01 -0700)]
vk: Fix build
Commit 1286bd, which deleted vk.c, broke the build. Update the Makefile
to fix it.
Jason Ekstrand [Wed, 3 Jun 2015 23:59:13 +0000 (16:59 -0700)]
vk/DS: Mask stencil masks to 8 bits
Kristian Høgsberg Kristensen [Wed, 3 Jun 2015 06:08:05 +0000 (23:08 -0700)]
vk: Set color/blend state in meta clear if not set yet
Kristian Høgsberg Kristensen [Wed, 3 Jun 2015 05:56:39 +0000 (22:56 -0700)]
vk: Delete vk.c test case
We now have crucible up and running and all vk sub-cases have been moved
over. Delete this crufty old hack of a test case.
Kristian Høgsberg Kristensen [Wed, 3 Jun 2015 05:53:43 +0000 (22:53 -0700)]
vk: Update generated headers with support for 64 bit fields
Kristian Høgsberg Kristensen [Wed, 3 Jun 2015 05:51:42 +0000 (22:51 -0700)]
vk: Set cb_state to NULL at cmd buffer create time
Dynamic color/blend state can be NULL in case we're not rendering to
color targets (only output to depth and/or stencil). Initialize
cmd_buffer->cb_state to NULL so we can reliably detect whether it's been
set or not.
Kristian Høgsberg Kristensen [Wed, 3 Jun 2015 05:35:47 +0000 (22:35 -0700)]
vk: Implement vertexOffset parameter of vkCmdDrawIndexed()
As exposed by the func.draw_indexed test, we were ignoring the argument
and hardcoding 0.
Jason Ekstrand [Tue, 2 Jun 2015 18:03:22 +0000 (11:03 -0700)]
vk/formats: Add a name to the metadata and better logging
Jason Ekstrand [Tue, 2 Jun 2015 18:01:41 +0000 (11:01 -0700)]
vk/formats: Rework the formats table
Kristian Høgsberg Kristensen [Tue, 2 Jun 2015 04:52:45 +0000 (21:52 -0700)]
vk: Move query related functionality to new file query.c
Jason Ekstrand [Thu, 7 May 2015 22:07:49 +0000 (15:07 -0700)]
i965: Use NIR by default for vertex shaders on GEN8+
GLSL IR vs. NIR shader-db results for SIMD8 vertex shaders on Broadwell:
total instructions in shared programs:
2742062 ->
2681339 (-2.21%)
instructions in affected programs:
1514770 ->
1454047 (-4.01%)
helped: 5813
HURT: 1120
The gained programs are ARB vertext programs that were previously going
through the vec4 backend. Now that we have prog_to_nir, ARB vertex
programs can go through the scalar backend so they show up as "gained" in
the shader-db results.
Acked-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
Acked-by: Matt Turner <mattst88@gmail.com>
Jason Ekstrand [Mon, 1 Jun 2015 19:24:31 +0000 (12:24 -0700)]
vk/compiler: Add an index_count to the bind map and check for OOB
Jason Ekstrand [Mon, 1 Jun 2015 17:01:23 +0000 (10:01 -0700)]
vk/HACK: Plumb real descriptor set/index into textures
Jason Ekstrand [Mon, 1 Jun 2015 17:00:44 +0000 (10:00 -0700)]
NIR: Add a helper for doing sampler lowering for vulkan
Kristian Høgsberg Kristensen [Mon, 1 Jun 2015 05:35:11 +0000 (22:35 -0700)]
vk: Indent tables to align '=' at column 48
Kristian Høgsberg Kristensen [Mon, 1 Jun 2015 05:15:34 +0000 (22:15 -0700)]
vk: Add support for anisotropic bits
Kristian Høgsberg Kristensen [Fri, 29 May 2015 23:06:06 +0000 (16:06 -0700)]
vk: Implement support for sampler border colors
This supports the three Vulkan border color types for float color
formats. The support for integer formats is a little trickier, as we
don't know the format of the texture at this time.
Jason Ekstrand [Sun, 31 May 2015 01:04:48 +0000 (18:04 -0700)]
vk/device: Only flush the texture cache when setting state base address
After further examination, it appears that the other flushes and stalls
weren't actually needed.
Jason Ekstrand [Sat, 30 May 2015 17:07:29 +0000 (10:07 -0700)]
vk/cmd_buffer: Track descriptor set dirtying per-stage
Jason Ekstrand [Sat, 30 May 2015 15:02:52 +0000 (08:02 -0700)]
vk/device: Emit PIPE_CONTROL flushes surrounding new STATE_BASE_ADDRESS
According to the bspec, you're supposed to emit a PIPE_CONTROL with a CS
stall and a render target flush prior to chainging STATE_BASE_ADDRESS. A
little experimentation, however, shows that this is not enough. It also
appears as if you have to flush the texture cache after chainging base
address or things won't propagate properly.
Jason Ekstrand [Sat, 30 May 2015 04:15:47 +0000 (21:15 -0700)]
vk/allocator: Don't call VALGRIND_MALLOCLIKE_BLOCK on fresh gem_mmap's
Jason Ekstrand [Sat, 30 May 2015 03:43:10 +0000 (20:43 -0700)]
vk: Don't crash on partial descriptor sets
Jason Ekstrand [Fri, 29 May 2015 16:40:03 +0000 (09:40 -0700)]
vk/device: Allow for starting a new surface state buffer
This commit allows for us to create a whole new surface state buffer when
the old one runs out of room. We simply re-emit the state base address for
the new state, re-emit binding tables, and keep going.
Jason Ekstrand [Fri, 29 May 2015 22:16:58 +0000 (15:16 -0700)]
vk/device: Do lazy surface state emission for binding tables
Before, we were emitting surface states up-front when binding tables were
updated. Now, we wait to emit the surface states until we emit the binding
table. This makes meta simpler and should make it easier to deal with
swapping out the surface state buffer.
Kristian Høgsberg Kristensen [Fri, 29 May 2015 18:32:53 +0000 (11:32 -0700)]
vk: Store dynamic slot index with struct anv_descriptor_slot
We need to make sure we use the right index into dynamic offset
array. Dynamic descriptors can be present or not in different stages and
to get the right offset, we need to compute the index at
vkCreateDescriptorSetLayout time.
Kristian Høgsberg Kristensen [Wed, 27 May 2015 21:05:50 +0000 (14:05 -0700)]
vk: Implement dynamic buffer offsets
We do this by creating a surface state on the fly that incorporates the
dynamic offset. This patch also refactor the descriptor set layout
constructor a bit to be less clever with switch statement fall
through. Instead of duplicating the subtle code to update the sampler
and surface slot map, we just use two switch statements.
Jason Ekstrand [Thu, 28 May 2015 22:34:08 +0000 (15:34 -0700)]
vk/device: Split state base address emit into its own function
Jason Ekstrand [Thu, 28 May 2015 22:25:02 +0000 (15:25 -0700)]
vk/device: Use anv_batch_emit for MI_BATCH_BUFFER_START
Jason Ekstrand [Thu, 28 May 2015 20:08:21 +0000 (13:08 -0700)]
vk/device: Actually destroy batch buffers
Jason Ekstrand [Thu, 28 May 2015 17:27:50 +0000 (10:27 -0700)]
vk/query: Don't emit a CS stall by itself
Both the bspec and the simulator don't like this. I'm not sure if stalling
at the scoreboard is right but it at least shuts up the simulator.
Jason Ekstrand [Thu, 28 May 2015 17:20:18 +0000 (10:20 -0700)]
vk/device: Fixups for batch buffer chaining
Some how these didn't get merged with the other batch buffer chaining
stuff. Oh well, it's here now.
Jason Ekstrand [Thu, 28 May 2015 17:06:45 +0000 (10:06 -0700)]
meta: Add a default ds_state and use it when no ds state is set
Jason Ekstrand [Thu, 28 May 2015 17:00:38 +0000 (10:00 -0700)]
vk/meta: Share the dummy RS and CB state between clear and blit
Kristian Høgsberg Kristensen [Thu, 28 May 2015 04:45:23 +0000 (21:45 -0700)]
vk: Initialize dynamic state binding points to NULL
We rely on these being initialized to NULL so meta can reliably detect
whether or not they've been set. ds_state is also allowed to not be
present so we need a well-defined value for that.
Chad Versace [Thu, 28 May 2015 00:01:09 +0000 (17:01 -0700)]
.gitignore: Ignore spirv2nir binary
Chad Versace [Wed, 27 May 2015 23:59:53 +0000 (16:59 -0700)]
.gitignore: Scope Vulkan's generated source files
Don't ignore any file named entrypoints.{c,h}. Ignore it only if it's in
src/vulkan.
Chad Versace [Wed, 27 May 2015 23:57:31 +0000 (16:57 -0700)]
vk: gitignore generated source files
Chad Versace [Wed, 27 May 2015 23:52:29 +0000 (16:52 -0700)]
vk/glsl_scraper: Replace adhoc arg parsing with argparse
Chad Versace [Wed, 27 May 2015 23:21:04 +0000 (16:21 -0700)]
vk/image: Assert that VkImageTiling is valid
Chad Versace [Wed, 27 May 2015 23:15:47 +0000 (16:15 -0700)]
vk/image: Remove trailing whitespace
Chad Versace [Wed, 27 May 2015 23:14:26 +0000 (16:14 -0700)]
vk/glsl: Reject invalid options
The script incorrectly interpreted --blah as the input filename.
Chad Versace [Wed, 27 May 2015 23:09:26 +0000 (16:09 -0700)]
vk/glsl_scraper: Indent large text blocks
Indent them to the same level as if the text was code.
No changes in entrypoints.{c,h} after a clean build.
Chad Versace [Wed, 27 May 2015 23:02:50 +0000 (16:02 -0700)]
vk/glsl_scraper: Fix code style for imports
Python style is one module imported per line, and imports are at the top
of the file.
Jason Ekstrand [Wed, 27 May 2015 19:06:30 +0000 (12:06 -0700)]
vk/meta: Actually create the CB state for blits
Jason Ekstrand [Wed, 27 May 2015 18:42:55 +0000 (11:42 -0700)]
vk: Rework anv_batch and use chaining batch buffers
This mega-commit primarily does two things. First, is to turn anv_batch
into a better abstraction of a batch. Instead of actually having a BO, it
now has a few pointers to some piece of memory that are used to add data to
the "batch". If it gets to the end, there is a function pointer that it
can call to attempt to grow the batch.
The second change is to start using chained batch buffers. When the end of
the current batch BO is reached, it automatically creates a new one and
ineserts an MI_BATCH_BUFFER_START command to chain to it. In this way, our
batch buffers are effectively infinite in length.
Jason Ekstrand [Wed, 27 May 2015 18:41:28 +0000 (11:41 -0700)]
Fixup for growable reloc lists
Jason Ekstrand [Tue, 26 May 2015 01:27:43 +0000 (18:27 -0700)]
vk/cmd_buffer: Allocate the surface_bo from device->batch_bo_pool
Jason Ekstrand [Tue, 26 May 2015 00:38:15 +0000 (17:38 -0700)]
vk/device: Make reloc lists growable
Jason Ekstrand [Mon, 25 May 2015 22:46:48 +0000 (15:46 -0700)]
vk/device: Use a bo pool for batch buffers
Jason Ekstrand [Mon, 25 May 2015 22:29:27 +0000 (15:29 -0700)]
vk/allocator: Add a BO pool
Jason Ekstrand [Mon, 25 May 2015 22:29:10 +0000 (15:29 -0700)]
vk/allocator: Add a free list that acts on pointers instead of offsets
Kristian Høgsberg [Wed, 27 May 2015 00:12:18 +0000 (17:12 -0700)]
vk: Add support for dynamic and pipeline color blend state