tests: Replace texture change colors with initial colors
We used to init texture with default colors and if you wanted something different, we'd map the image, change the colors and unmap the image. With Nvidia and optimal_tiled textures, this would turn into create a linear image, write new colors to it and issue a copy command to copy it to the real texture image. Since all the tests knew the colors they wanted at texture construction time, it seemed better/easier to chage the constructor to just take the colors if non-default was desired.
diff --git a/tests/xglrenderframework.cpp b/tests/xglrenderframework.cpp
index 0a54ed3..acd2c98 100644
--- a/tests/xglrenderframework.cpp
+++ b/tests/xglrenderframework.cpp
@@ -459,11 +459,14 @@
return XGL_SUCCESS;
}
-XglTextureObj::XglTextureObj(XglDevice *device)
+XglTextureObj::XglTextureObj(XglDevice *device, uint32_t *colors)
{
m_device = device;
const XGL_FORMAT tex_format = XGL_FMT_B8G8R8A8_UNORM;
- const uint32_t tex_colors[2] = { 0xffff0000, 0xff00ff00 };
+ uint32_t tex_colors[2] = { 0xffff0000, 0xff00ff00 };
+
+ if (colors == NULL)
+ colors = tex_colors;
memset(&m_textureViewInfo,0,sizeof(m_textureViewInfo));
@@ -519,7 +522,7 @@
for (y = 0; y < extent().height; y++) {
uint32_t *row = (uint32_t *) ((char *) data + layout.rowPitch * y);
for (x = 0; x < extent().width; x++)
- row[x] = tex_colors[(x & 1) ^ (y & 1)];
+ row[x] = colors[(x & 1) ^ (y & 1)];
}
unmap();
@@ -528,22 +531,6 @@
}
-void XglTextureObj::ChangeColors(uint32_t color1, uint32_t color2)
-{
- const uint32_t tex_colors[2] = { color1, color2 };
- void *data;
-
- data = map();
-
- for (int y = 0; y < extent().height; y++) {
- uint32_t *row = (uint32_t *) ((char *) data + m_rowPitch * y);
- for (int x = 0; x < extent().width; x++)
- row[x] = tex_colors[(x & 1) ^ (y & 1)];
- }
-
- unmap();
-}
-
XglSamplerObj::XglSamplerObj(XglDevice *device)
{
m_device = device;