vk: Add new anv_gen8.c and move CreateDynamicRasterState there
Signed-off-by: Kristian Høgsberg Kristensen <kristian.h.kristensen@intel.com>
This commit is contained in:
parent
ee9788973f
commit
74556b076a
|
@ -72,7 +72,8 @@ VULKAN_SOURCES = \
|
||||||
anv_private.h \
|
anv_private.h \
|
||||||
anv_query.c \
|
anv_query.c \
|
||||||
anv_util.c \
|
anv_util.c \
|
||||||
anv_x11.c
|
anv_x11.c \
|
||||||
|
anv_gen8.c
|
||||||
|
|
||||||
libvulkan_la_SOURCES = \
|
libvulkan_la_SOURCES = \
|
||||||
$(VULKAN_SOURCES) \
|
$(VULKAN_SOURCES) \
|
||||||
|
|
|
@ -769,8 +769,8 @@ VkResult anv_DeviceWaitIdle(
|
||||||
bo = &device->dynamic_state_pool.block_pool->bo;
|
bo = &device->dynamic_state_pool.block_pool->bo;
|
||||||
batch.start = batch.next = state.map;
|
batch.start = batch.next = state.map;
|
||||||
batch.end = state.map + 32;
|
batch.end = state.map + 32;
|
||||||
anv_batch_emit(&batch, GEN8_MI_BATCH_BUFFER_END);
|
anv_batch_emit(&batch, GEN7_MI_BATCH_BUFFER_END);
|
||||||
anv_batch_emit(&batch, GEN8_MI_NOOP);
|
anv_batch_emit(&batch, GEN7_MI_NOOP);
|
||||||
|
|
||||||
exec2_objects[0].handle = bo->gem_handle;
|
exec2_objects[0].handle = bo->gem_handle;
|
||||||
exec2_objects[0].relocation_count = 0;
|
exec2_objects[0].relocation_count = 0;
|
||||||
|
@ -1996,39 +1996,7 @@ VkResult anv_CreateDynamicRasterState(
|
||||||
const VkDynamicRasterStateCreateInfo* pCreateInfo,
|
const VkDynamicRasterStateCreateInfo* pCreateInfo,
|
||||||
VkDynamicRasterState* pState)
|
VkDynamicRasterState* pState)
|
||||||
{
|
{
|
||||||
ANV_FROM_HANDLE(anv_device, device, _device);
|
return driver_layer->CreateDynamicRasterState(_device, pCreateInfo, pState);
|
||||||
struct anv_dynamic_rs_state *state;
|
|
||||||
|
|
||||||
assert(pCreateInfo->sType == VK_STRUCTURE_TYPE_DYNAMIC_RASTER_STATE_CREATE_INFO);
|
|
||||||
|
|
||||||
state = anv_device_alloc(device, sizeof(*state), 8,
|
|
||||||
VK_SYSTEM_ALLOC_TYPE_API_OBJECT);
|
|
||||||
if (state == NULL)
|
|
||||||
return vk_error(VK_ERROR_OUT_OF_HOST_MEMORY);
|
|
||||||
|
|
||||||
struct GEN8_3DSTATE_SF sf = {
|
|
||||||
GEN8_3DSTATE_SF_header,
|
|
||||||
.LineWidth = pCreateInfo->lineWidth,
|
|
||||||
};
|
|
||||||
|
|
||||||
GEN8_3DSTATE_SF_pack(NULL, state->state_sf, &sf);
|
|
||||||
|
|
||||||
bool enable_bias = pCreateInfo->depthBias != 0.0f ||
|
|
||||||
pCreateInfo->slopeScaledDepthBias != 0.0f;
|
|
||||||
struct GEN8_3DSTATE_RASTER raster = {
|
|
||||||
.GlobalDepthOffsetEnableSolid = enable_bias,
|
|
||||||
.GlobalDepthOffsetEnableWireframe = enable_bias,
|
|
||||||
.GlobalDepthOffsetEnablePoint = enable_bias,
|
|
||||||
.GlobalDepthOffsetConstant = pCreateInfo->depthBias,
|
|
||||||
.GlobalDepthOffsetScale = pCreateInfo->slopeScaledDepthBias,
|
|
||||||
.GlobalDepthOffsetClamp = pCreateInfo->depthBiasClamp
|
|
||||||
};
|
|
||||||
|
|
||||||
GEN8_3DSTATE_RASTER_pack(NULL, state->state_raster, &raster);
|
|
||||||
|
|
||||||
*pState = anv_dynamic_rs_state_to_handle(state);
|
|
||||||
|
|
||||||
return VK_SUCCESS;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
VkResult anv_DestroyDynamicRasterState(
|
VkResult anv_DestroyDynamicRasterState(
|
||||||
|
|
|
@ -0,0 +1,70 @@
|
||||||
|
/*
|
||||||
|
* Copyright © 2015 Intel Corporation
|
||||||
|
*
|
||||||
|
* Permission is hereby granted, free of charge, to any person obtaining a
|
||||||
|
* copy of this software and associated documentation files (the "Software"),
|
||||||
|
* to deal in the Software without restriction, including without limitation
|
||||||
|
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
|
||||||
|
* and/or sell copies of the Software, and to permit persons to whom the
|
||||||
|
* Software is furnished to do so, subject to the following conditions:
|
||||||
|
*
|
||||||
|
* The above copyright notice and this permission notice (including the next
|
||||||
|
* paragraph) shall be included in all copies or substantial portions of the
|
||||||
|
* Software.
|
||||||
|
*
|
||||||
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||||
|
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||||
|
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
|
||||||
|
* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||||
|
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
|
||||||
|
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
|
||||||
|
* IN THE SOFTWARE.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include <assert.h>
|
||||||
|
#include <stdbool.h>
|
||||||
|
#include <string.h>
|
||||||
|
#include <unistd.h>
|
||||||
|
#include <fcntl.h>
|
||||||
|
|
||||||
|
#include "anv_private.h"
|
||||||
|
|
||||||
|
VkResult gen8_CreateDynamicRasterState(
|
||||||
|
VkDevice _device,
|
||||||
|
const VkDynamicRasterStateCreateInfo* pCreateInfo,
|
||||||
|
VkDynamicRasterState* pState)
|
||||||
|
{
|
||||||
|
ANV_FROM_HANDLE(anv_device, device, _device);
|
||||||
|
struct anv_dynamic_rs_state *state;
|
||||||
|
|
||||||
|
assert(pCreateInfo->sType == VK_STRUCTURE_TYPE_DYNAMIC_RASTER_STATE_CREATE_INFO);
|
||||||
|
|
||||||
|
state = anv_device_alloc(device, sizeof(*state), 8,
|
||||||
|
VK_SYSTEM_ALLOC_TYPE_API_OBJECT);
|
||||||
|
if (state == NULL)
|
||||||
|
return vk_error(VK_ERROR_OUT_OF_HOST_MEMORY);
|
||||||
|
|
||||||
|
struct GEN8_3DSTATE_SF sf = {
|
||||||
|
GEN8_3DSTATE_SF_header,
|
||||||
|
.LineWidth = pCreateInfo->lineWidth,
|
||||||
|
};
|
||||||
|
|
||||||
|
GEN8_3DSTATE_SF_pack(NULL, state->state_sf, &sf);
|
||||||
|
|
||||||
|
bool enable_bias = pCreateInfo->depthBias != 0.0f ||
|
||||||
|
pCreateInfo->slopeScaledDepthBias != 0.0f;
|
||||||
|
struct GEN8_3DSTATE_RASTER raster = {
|
||||||
|
.GlobalDepthOffsetEnableSolid = enable_bias,
|
||||||
|
.GlobalDepthOffsetEnableWireframe = enable_bias,
|
||||||
|
.GlobalDepthOffsetEnablePoint = enable_bias,
|
||||||
|
.GlobalDepthOffsetConstant = pCreateInfo->depthBias,
|
||||||
|
.GlobalDepthOffsetScale = pCreateInfo->slopeScaledDepthBias,
|
||||||
|
.GlobalDepthOffsetClamp = pCreateInfo->depthBiasClamp
|
||||||
|
};
|
||||||
|
|
||||||
|
GEN8_3DSTATE_RASTER_pack(NULL, state->state_raster, &raster);
|
||||||
|
|
||||||
|
*pState = anv_dynamic_rs_state_to_handle(state);
|
||||||
|
|
||||||
|
return VK_SUCCESS;
|
||||||
|
}
|
Loading…
Reference in New Issue