OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gallium/osmesa: Return cleanly for OSMesaGetDepthBuffer() with no depth.

Browse Source 
This makes our behavior match classic.

Closes: #2034
Reviewed-by: Adam Jackson <ajax@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7886>
This commit is contained in:
Eric Anholt
2020-12-02 17:03:33 -08:00
parent ddbad3f4ea
commit ef9362acb8
2 changed files with 27 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/gallium/frontends/osmesa/osmesa.c
View File

@@ -918,6 +918,14 @@ OSMesaGetDepthBuffer(OSMesaContext c, GLint *width, GLint *height,
struct osmesa_buffer *osbuffer = c->current_buffer;
struct pipe_resource *res = osbuffer->textures[ST_ATTACHMENT_DEPTH_STENCIL];
if (!res) {
*width = 0;
*height = 0;
*bytesPerValue = 0;
*buffer = NULL;
return GL_FALSE;
}
*width = res->width0;
*height = res->height0;
*bytesPerValue = util_format_get_blocksize(res->format);

19
src/gallium/targets/osmesa/test-render.cpp
View File

@@ -216,6 +216,25 @@ TEST(OSMesaRenderTest, depth)
EXPECT_EQ(depth[w * 1 + 1], 0x00000000);
}
TEST(OSMesaRenderTest, depth_get_no_attachment)
{
std::unique_ptr<osmesa_context, decltype(&OSMesaDestroyContext)> ctx{
OSMesaCreateContextExt(OSMESA_RGBA, 0, 0, 0, NULL), &OSMesaDestroyContext};
ASSERT_TRUE(ctx);
uint32_t pixel;
auto ret = OSMesaMakeCurrent(ctx.get(), &pixel, GL_UNSIGNED_BYTE, 1, 1);
ASSERT_EQ(ret, GL_TRUE);
uint32_t *depth;
GLint dw = 1, dh = 1, depth_cpp = 1;
ASSERT_EQ(false, OSMesaGetDepthBuffer(ctx.get(), &dw, &dh, &depth_cpp, (void **)&depth));
ASSERT_EQ(depth_cpp, NULL);
ASSERT_EQ(dw, 0);
ASSERT_EQ(dh, 0);
ASSERT_EQ(depth_cpp, 0);
}
static uint32_t be_bswap32(uint32_t x)
{
if (UTIL_ARCH_BIG_ENDIAN)