#include <stdbool.h>
#include "dri_util.h"
#include "utils.h"
-#include "util/xmlpool.h"
+#include "util/u_endian.h"
+#include "util/driconf.h"
#include "main/mtypes.h"
#include "main/framebuffer.h"
#include "main/version.h"
psp->swrast_loader = (__DRIswrastLoaderExtension *) extensions[i];
if (strcmp(extensions[i]->name, __DRI_IMAGE_LOADER) == 0)
psp->image.loader = (__DRIimageLoaderExtension *) extensions[i];
+ if (strcmp(extensions[i]->name, __DRI_MUTABLE_RENDER_BUFFER_LOADER) == 0)
+ psp->mutableRenderBuffer.loader = (__DRImutableRenderBufferLoaderExtension *) extensions[i];
}
}
/* Option parsing before ->InitScreen(), as some options apply there. */
driParseOptionInfo(&psp->optionInfo, __dri2ConfigOptions);
- driParseConfigFiles(&psp->optionCache, &psp->optionInfo, psp->myNum, "dri2");
+ driParseConfigFiles(&psp->optionCache, &psp->optionInfo, psp->myNum,
+ "dri2", NULL, NULL, 0, NULL, 0);
*driver_configs = psp->driver->InitScreen(psp);
if (*driver_configs == NULL) {
}
}
+/*
+ * Note: the first match is returned, which is important for formats like
+ * __DRI_IMAGE_FORMAT_R8 which maps to both MESA_FORMAT_{R,L}_UNORM8
+ */
+static const struct {
+ uint32_t image_format;
+ mesa_format mesa_format;
+ GLenum internal_format;
+} format_mapping[] = {
+ {
+ .image_format = __DRI_IMAGE_FORMAT_RGB565,
+ .mesa_format = MESA_FORMAT_B5G6R5_UNORM,
+ .internal_format = GL_RGB565,
+ },
+ {
+ .image_format = __DRI_IMAGE_FORMAT_ARGB1555,
+ .mesa_format = MESA_FORMAT_B5G5R5A1_UNORM,
+ .internal_format = GL_RGB5_A1,
+ },
+ {
+ .image_format = __DRI_IMAGE_FORMAT_XRGB8888,
+ .mesa_format = MESA_FORMAT_B8G8R8X8_UNORM,
+ .internal_format = GL_RGB8,
+ },
+ {
+ .image_format = __DRI_IMAGE_FORMAT_ABGR16161616F,
+ .mesa_format = MESA_FORMAT_RGBA_FLOAT16,
+ .internal_format = GL_RGBA16F,
+ },
+ {
+ .image_format = __DRI_IMAGE_FORMAT_XBGR16161616F,
+ .mesa_format = MESA_FORMAT_RGBX_FLOAT16,
+ .internal_format = GL_RGBA16F,
+ },
+ {
+ .image_format = __DRI_IMAGE_FORMAT_ARGB2101010,
+ .mesa_format = MESA_FORMAT_B10G10R10A2_UNORM,
+ .internal_format = GL_RGB10_A2,
+ },
+ {
+ .image_format = __DRI_IMAGE_FORMAT_XRGB2101010,
+ .mesa_format = MESA_FORMAT_B10G10R10X2_UNORM,
+ .internal_format = GL_RGB10_A2,
+ },
+ {
+ .image_format = __DRI_IMAGE_FORMAT_ABGR2101010,
+ .mesa_format = MESA_FORMAT_R10G10B10A2_UNORM,
+ .internal_format = GL_RGB10_A2,
+ },
+ {
+ .image_format = __DRI_IMAGE_FORMAT_XBGR2101010,
+ .mesa_format = MESA_FORMAT_R10G10B10X2_UNORM,
+ .internal_format = GL_RGB10_A2,
+ },
+ {
+ .image_format = __DRI_IMAGE_FORMAT_ARGB8888,
+ .mesa_format = MESA_FORMAT_B8G8R8A8_UNORM,
+ .internal_format = GL_RGBA8,
+ },
+ {
+ .image_format = __DRI_IMAGE_FORMAT_ABGR8888,
+ .mesa_format = MESA_FORMAT_R8G8B8A8_UNORM,
+ .internal_format = GL_RGBA8,
+ },
+ {
+ .image_format = __DRI_IMAGE_FORMAT_XBGR8888,
+ .mesa_format = MESA_FORMAT_R8G8B8X8_UNORM,
+ .internal_format = GL_RGB8,
+ },
+ {
+ .image_format = __DRI_IMAGE_FORMAT_R8,
+ .mesa_format = MESA_FORMAT_R_UNORM8,
+ .internal_format = GL_R8,
+ },
+ {
+ .image_format = __DRI_IMAGE_FORMAT_R8,
+ .mesa_format = MESA_FORMAT_L_UNORM8,
+ .internal_format = GL_R8,
+ },
+#if UTIL_ARCH_LITTLE_ENDIAN
+ {
+ .image_format = __DRI_IMAGE_FORMAT_GR88,
+ .mesa_format = MESA_FORMAT_RG_UNORM8,
+ .internal_format = GL_RG8,
+ },
+ {
+ .image_format = __DRI_IMAGE_FORMAT_GR88,
+ .mesa_format = MESA_FORMAT_LA_UNORM8,
+ .internal_format = GL_RG8,
+ },
+#endif
+ {
+ .image_format = __DRI_IMAGE_FORMAT_SABGR8,
+ .mesa_format = MESA_FORMAT_R8G8B8A8_SRGB,
+ .internal_format = GL_SRGB8_ALPHA8,
+ },
+ {
+ .image_format = __DRI_IMAGE_FORMAT_SARGB8,
+ .mesa_format = MESA_FORMAT_B8G8R8A8_SRGB,
+ .internal_format = GL_SRGB8_ALPHA8,
+ },
+ {
+ .image_format = __DRI_IMAGE_FORMAT_SXRGB8,
+ .mesa_format = MESA_FORMAT_B8G8R8X8_SRGB,
+ .internal_format = GL_SRGB8_ALPHA8,
+ },
+ {
+ .image_format = __DRI_IMAGE_FORMAT_R16,
+ .mesa_format = MESA_FORMAT_R_UNORM16,
+ .internal_format = GL_R16,
+ },
+ {
+ .image_format = __DRI_IMAGE_FORMAT_R16,
+ .mesa_format = MESA_FORMAT_L_UNORM16,
+ .internal_format = GL_R16,
+ },
+#if UTIL_ARCH_LITTLE_ENDIAN
+ {
+ .image_format = __DRI_IMAGE_FORMAT_GR1616,
+ .mesa_format = MESA_FORMAT_RG_UNORM16,
+ .internal_format = GL_RG16,
+ },
+ {
+ .image_format = __DRI_IMAGE_FORMAT_GR1616,
+ .mesa_format = MESA_FORMAT_LA_UNORM16,
+ .internal_format = GL_RG16,
+ },
+#endif
+};
+
uint32_t
driGLFormatToImageFormat(mesa_format format)
{
- switch (format) {
- case MESA_FORMAT_B5G6R5_UNORM:
- return __DRI_IMAGE_FORMAT_RGB565;
- case MESA_FORMAT_B5G5R5A1_UNORM:
- return __DRI_IMAGE_FORMAT_ARGB1555;
- case MESA_FORMAT_B8G8R8X8_UNORM:
- return __DRI_IMAGE_FORMAT_XRGB8888;
- case MESA_FORMAT_B10G10R10A2_UNORM:
- return __DRI_IMAGE_FORMAT_ARGB2101010;
- case MESA_FORMAT_B10G10R10X2_UNORM:
- return __DRI_IMAGE_FORMAT_XRGB2101010;
- case MESA_FORMAT_R10G10B10A2_UNORM:
- return __DRI_IMAGE_FORMAT_ABGR2101010;
- case MESA_FORMAT_R10G10B10X2_UNORM:
- return __DRI_IMAGE_FORMAT_XBGR2101010;
- case MESA_FORMAT_B8G8R8A8_UNORM:
- return __DRI_IMAGE_FORMAT_ARGB8888;
- case MESA_FORMAT_R8G8B8A8_UNORM:
- return __DRI_IMAGE_FORMAT_ABGR8888;
- case MESA_FORMAT_R8G8B8X8_UNORM:
- return __DRI_IMAGE_FORMAT_XBGR8888;
- case MESA_FORMAT_L_UNORM8:
- case MESA_FORMAT_R_UNORM8:
- return __DRI_IMAGE_FORMAT_R8;
- case MESA_FORMAT_L8A8_UNORM:
- case MESA_FORMAT_R8G8_UNORM:
- return __DRI_IMAGE_FORMAT_GR88;
- case MESA_FORMAT_NONE:
- return __DRI_IMAGE_FORMAT_NONE;
- case MESA_FORMAT_R8G8B8A8_SRGB:
- return __DRI_IMAGE_FORMAT_SABGR8;
- case MESA_FORMAT_B8G8R8A8_SRGB:
- return __DRI_IMAGE_FORMAT_SARGB8;
- default:
- return __DRI_IMAGE_FORMAT_NONE;
- }
+ for (size_t i = 0; i < ARRAY_SIZE(format_mapping); i++)
+ if (format_mapping[i].mesa_format == format)
+ return format_mapping[i].image_format;
+
+ return __DRI_IMAGE_FORMAT_NONE;
+}
+
+uint32_t
+driGLFormatToSizedInternalGLFormat(mesa_format format)
+{
+ for (size_t i = 0; i < ARRAY_SIZE(format_mapping); i++)
+ if (format_mapping[i].mesa_format == format)
+ return format_mapping[i].internal_format;
+
+ return GL_NONE;
}
mesa_format
driImageFormatToGLFormat(uint32_t image_format)
{
- switch (image_format) {
- case __DRI_IMAGE_FORMAT_RGB565:
- return MESA_FORMAT_B5G6R5_UNORM;
- case __DRI_IMAGE_FORMAT_ARGB1555:
- return MESA_FORMAT_B5G5R5A1_UNORM;
- case __DRI_IMAGE_FORMAT_XRGB8888:
- return MESA_FORMAT_B8G8R8X8_UNORM;
- case __DRI_IMAGE_FORMAT_ARGB2101010:
- return MESA_FORMAT_B10G10R10A2_UNORM;
- case __DRI_IMAGE_FORMAT_XRGB2101010:
- return MESA_FORMAT_B10G10R10X2_UNORM;
- case __DRI_IMAGE_FORMAT_ABGR2101010:
- return MESA_FORMAT_R10G10B10A2_UNORM;
- case __DRI_IMAGE_FORMAT_XBGR2101010:
- return MESA_FORMAT_R10G10B10X2_UNORM;
- case __DRI_IMAGE_FORMAT_ARGB8888:
- return MESA_FORMAT_B8G8R8A8_UNORM;
- case __DRI_IMAGE_FORMAT_ABGR8888:
- return MESA_FORMAT_R8G8B8A8_UNORM;
- case __DRI_IMAGE_FORMAT_XBGR8888:
- return MESA_FORMAT_R8G8B8X8_UNORM;
- case __DRI_IMAGE_FORMAT_R8:
- return MESA_FORMAT_R_UNORM8;
- case __DRI_IMAGE_FORMAT_R16:
- return MESA_FORMAT_R_UNORM16;
- case __DRI_IMAGE_FORMAT_GR88:
- return MESA_FORMAT_R8G8_UNORM;
- case __DRI_IMAGE_FORMAT_GR1616:
- return MESA_FORMAT_R16G16_UNORM;
- case __DRI_IMAGE_FORMAT_SARGB8:
- return MESA_FORMAT_B8G8R8A8_SRGB;
- case __DRI_IMAGE_FORMAT_SABGR8:
- return MESA_FORMAT_R8G8B8A8_SRGB;
- case __DRI_IMAGE_FORMAT_NONE:
- return MESA_FORMAT_NONE;
- default:
- return MESA_FORMAT_NONE;
- }
+ for (size_t i = 0; i < ARRAY_SIZE(format_mapping); i++)
+ if (format_mapping[i].image_format == image_format)
+ return format_mapping[i].mesa_format;
+
+ return MESA_FORMAT_NONE;
}
/** Image driver interface */
projects / mesa.git / blobdiff