Skip to content

Commit 43b7f07

Browse files
committed
Fix compilation issues with VS2013
Visual Studio 2013 apparently has an issue with sizeof when the variable is in a namespace and then in a struct.
1 parent 76f4022 commit 43b7f07

1 file changed

Lines changed: 2 additions & 3 deletions

File tree

amd_depthoffieldfx/src/AMD_DepthOfFieldFX_Opaque.cpp

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,6 @@ struct float4
5656

5757
struct float2
5858
{
59-
float2(float x_, float y_) : x(x_), y(y_) {}
6059
float x;
6160
float y;
6261
};
@@ -469,8 +468,8 @@ BOOL DEPTHOFFIELDFX_OPAQUE_DESC::update_constant_buffer(const DEPTHOFFIELDFX_DES
469468
pParams->invSourceResolution.y = 1.0f / static_cast<float>(desc.m_screenSize.y);
470469
pParams->padding = desc.m_pOpaque->m_padding;
471470
pParams->scale_factor = float(1 << desc.m_scaleFactor);
472-
memcpy(pParams->bartlettData, s_bartlettData, sizeof(dofParams::bartlettData));
473-
memcpy(pParams->boxBartlettData, s_boxBartlettData, sizeof(dofParams::boxBartlettData));
471+
memcpy(pParams->bartlettData, s_bartlettData, sizeof(s_bartlettData));
472+
memcpy(pParams->boxBartlettData, s_boxBartlettData, sizeof(s_boxBartlettData));
474473

475474
pCtx->Unmap(m_pDofParamsCB, 0);
476475
}

0 commit comments

Comments
 (0)