commit e9864b5e31ed86a706366bdb8b41a0f2367284d1
author Chia-I Wu <olv@lunarg.com> Sun Dec 28 16:32:24 2014 +0800
committer Courtney Goeltzenleuchter <courtney@LunarG.com> Wed Feb 04 17:58:03 2015 -0700
tree 01f6b1361d6dac617f39b35999e8e9f7ea7f782e
parent 13a3aa8b51fda0d0f0b191bb9486c2da4a22c737

tests: derive XglSamplerObj from xgl_testing::Sampler

tests/xglrenderframework.cpp

diff --git a/tests/xglrenderframework.cpp b/tests/xglrenderframework.cpp
index 91a0911..6ee0d7d 100644
--- a/tests/xglrenderframework.cpp
+++ b/tests/xglrenderframework.cpp
@@ -351,7 +351,7 @@
     }
     for (int i=0; i<m_samplers.size();i++)
     {
-        xglAttachSamplerDescriptors( m_rsrcDescSet, m_samplerSlots[i], 1, &m_samplers[i]->m_sampler );
+        xglAttachSamplerDescriptors( m_rsrcDescSet, m_samplerSlots[i], 1, &m_samplers[i]->obj() );
     }
     for (int i=0; i<m_imageViews.size();i++)
     {
@@ -395,7 +395,7 @@
     }
     for (int i=0; i<m_samplers.size();i++)
     {
-        xglAttachSamplerDescriptors( m_rsrcDescSet, m_samplerSlots[i], 1, &m_samplers[i]->m_sampler );
+        xglAttachSamplerDescriptors( m_rsrcDescSet, m_samplerSlots[i], 1, &m_samplers[i]->obj() );
     }
     for (int i=0; i<m_imageViews.size();i++)
     {
@@ -499,32 +499,25 @@
 
 XglSamplerObj::XglSamplerObj(XglDevice *device)
 {
-    XGL_RESULT err = XGL_SUCCESS;
-
     m_device = device;
-    memset(&m_samplerCreateInfo,0,sizeof(m_samplerCreateInfo));
-    m_samplerCreateInfo.sType = XGL_STRUCTURE_TYPE_SAMPLER_CREATE_INFO;
-    m_samplerCreateInfo.magFilter = XGL_TEX_FILTER_NEAREST;
-    m_samplerCreateInfo.minFilter = XGL_TEX_FILTER_NEAREST;
-    m_samplerCreateInfo.mipMode = XGL_TEX_MIPMAP_BASE;
-    m_samplerCreateInfo.addressU = XGL_TEX_ADDRESS_WRAP;
-    m_samplerCreateInfo.addressV = XGL_TEX_ADDRESS_WRAP;
-    m_samplerCreateInfo.addressW = XGL_TEX_ADDRESS_WRAP;
-    m_samplerCreateInfo.mipLodBias = 0.0;
-    m_samplerCreateInfo.maxAnisotropy = 0.0;
-    m_samplerCreateInfo.compareFunc = XGL_COMPARE_NEVER;
-    m_samplerCreateInfo.minLod = 0.0;
-    m_samplerCreateInfo.maxLod = 0.0;
-    m_samplerCreateInfo.borderColorType = XGL_BORDER_COLOR_OPAQUE_WHITE;
 
-    err = xglCreateSampler(m_device->device(),&m_samplerCreateInfo, &m_sampler);
-    assert(!err);
+    XGL_SAMPLER_CREATE_INFO samplerCreateInfo;
+    memset(&samplerCreateInfo,0,sizeof(samplerCreateInfo));
+    samplerCreateInfo.sType = XGL_STRUCTURE_TYPE_SAMPLER_CREATE_INFO;
+    samplerCreateInfo.magFilter = XGL_TEX_FILTER_NEAREST;
+    samplerCreateInfo.minFilter = XGL_TEX_FILTER_NEAREST;
+    samplerCreateInfo.mipMode = XGL_TEX_MIPMAP_BASE;
+    samplerCreateInfo.addressU = XGL_TEX_ADDRESS_WRAP;
+    samplerCreateInfo.addressV = XGL_TEX_ADDRESS_WRAP;
+    samplerCreateInfo.addressW = XGL_TEX_ADDRESS_WRAP;
+    samplerCreateInfo.mipLodBias = 0.0;
+    samplerCreateInfo.maxAnisotropy = 0.0;
+    samplerCreateInfo.compareFunc = XGL_COMPARE_NEVER;
+    samplerCreateInfo.minLod = 0.0;
+    samplerCreateInfo.maxLod = 0.0;
+    samplerCreateInfo.borderColorType = XGL_BORDER_COLOR_OPAQUE_WHITE;
 
-}
-
-XglSamplerObj::~XglSamplerObj()
-{
-    if (m_sampler != XGL_NULL_HANDLE) xglDestroyObject(m_sampler);
+    init(*m_device, samplerCreateInfo);
 }
 
 /*