From 1710d8d2cd8b73668c19bec9cad34e40b2aa68f8 Mon Sep 17 00:00:00 2001 From: Courtney Goeltzenleuchter Date: Wed, 11 Feb 2015 14:13:34 -0700 Subject: intel: Remove scissor enable and scissor count bug #12925 header version: r29511 Remove separate scissor enable and scissor count. Scissor always enabled and must always provide scissor rect for every viewport. --- layers/draw_state.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'layers') diff --git a/layers/draw_state.c b/layers/draw_state.c index c07367f8..0fa5b7cf 100644 --- a/layers/draw_state.c +++ b/layers/draw_state.c @@ -293,13 +293,13 @@ static void insertDynamicState(const XGL_DYNAMIC_STATE_OBJECT state, const GENER if (XGL_STRUCTURE_TYPE_DYNAMIC_VP_STATE_CREATE_INFO == pCreateInfo->sType) { XGL_DYNAMIC_VP_STATE_CREATE_INFO* pVPCI = (XGL_DYNAMIC_VP_STATE_CREATE_INFO*)pStateNode->pCreateInfo; XGL_VIEWPORT** ppViewports = (XGL_VIEWPORT**)&pVPCI->pViewports; - size_t vpSize = sizeof(XGL_VIEWPORT) * pVPCI->viewportCount; + size_t vpSize = sizeof(XGL_VIEWPORT) * pVPCI->viewportAndScissorCount; if (vpSize) { *ppViewports = (XGL_VIEWPORT*)malloc(vpSize); memcpy(*ppViewports, ((XGL_DYNAMIC_VP_STATE_CREATE_INFO*)pCreateInfo)->pViewports, vpSize); } XGL_RECT** ppScissors = (XGL_RECT**)&pVPCI->pScissors; - size_t scSize = sizeof(XGL_RECT) * pVPCI->scissorCount; + size_t scSize = sizeof(XGL_RECT) * pVPCI->viewportAndScissorCount; if (scSize) { *ppScissors = (XGL_RECT*)malloc(scSize); memcpy(*ppScissors, ((XGL_DYNAMIC_VP_STATE_CREATE_INFO*)pCreateInfo)->pScissors, scSize); -- cgit v1.2.3