*
*/
+#include <stdio.h>
+#include <xf86drm.h>
+#include <nouveau_drm.h>
#include "nouveau_driver.h"
#include "nouveau_context.h"
#include "nouveau_fbo.h"
const uint8_t msaa_samples[] = { 0 };
static const mesa_format formats[3] = {
- MESA_FORMAT_RGB565,
- MESA_FORMAT_ARGB8888,
- MESA_FORMAT_XRGB8888,
+ MESA_FORMAT_B5G6R5_UNORM,
+ MESA_FORMAT_B8G8R8A8_UNORM,
+ MESA_FORMAT_B8G8R8X8_UNORM,
};
const GLenum back_buffer_modes[] = {
GLX_NONE, GLX_SWAP_UNDEFINED_OML
};
- for (i = 0; i < Elements(formats); i++) {
+ for (i = 0; i < ARRAY_SIZE(formats); i++) {
__DRIconfig **config;
config = driCreateConfigs(formats[i],
depth_bits, stencil_bits,
- Elements(depth_bits),
+ ARRAY_SIZE(depth_bits),
back_buffer_modes,
- Elements(back_buffer_modes),
+ ARRAY_SIZE(back_buffer_modes),
msaa_samples,
- Elements(msaa_samples),
+ ARRAY_SIZE(msaa_samples),
GL_TRUE);
assert(config);
if (!screen)
return NULL;
+ dri_screen->driverPrivate = screen;
+
/* Open the DRM device. */
ret = nouveau_device_wrap(dri_screen->fd, 0, &screen->device);
if (ret) {
switch (screen->device->chipset & 0xf0) {
case 0x00:
screen->driver = &nv04_driver;
+ dri_screen->max_gl_compat_version = 12;
break;
case 0x10:
screen->driver = &nv10_driver;
+ dri_screen->max_gl_compat_version = 12;
+ dri_screen->max_gl_es1_version = 10;
break;
case 0x20:
screen->driver = &nv20_driver;
+ dri_screen->max_gl_compat_version = 13;
+ dri_screen->max_gl_es1_version = 10;
break;
default:
- assert(0);
+ nouveau_error("Unknown chipset: %02X\n",
+ screen->device->chipset);
+ goto fail;
}
- /* Compat version validation will occur at context init after
- * _mesa_compute_version().
- */
- dri_screen->max_gl_compat_version = 15;
-
- /* NV10 and NV20 can support OpenGL ES 1.0 only. Older chips
- * cannot do even that.
- */
- if ((screen->device->chipset & 0xf0) != 0x00)
- dri_screen->max_gl_es1_version = 10;
-
- dri_screen->driverPrivate = screen;
dri_screen->extensions = nouveau_screen_extensions;
screen->dri_screen = dri_screen;
}
+static int
+nouveau_query_renderer_integer(__DRIscreen *psp, int param,
+ unsigned int *value)
+{
+ const struct nouveau_screen *const screen =
+ (struct nouveau_screen *) psp->driverPrivate;
+
+ switch (param) {
+ case __DRI2_RENDERER_VENDOR_ID:
+ value[0] = 0x10de;
+ return 0;
+ case __DRI2_RENDERER_DEVICE_ID: {
+ uint64_t device_id;
+
+ if (nouveau_getparam(screen->device,
+ NOUVEAU_GETPARAM_PCI_DEVICE,
+ &device_id)) {
+ nouveau_error("Error retrieving the device PCIID.\n");
+ device_id = -1;
+ }
+ value[0] = (unsigned int) device_id;
+ return 0;
+ }
+ case __DRI2_RENDERER_ACCELERATED:
+ value[0] = 1;
+ return 0;
+ case __DRI2_RENDERER_VIDEO_MEMORY:
+ /* XXX: return vram_size or vram_limit ? */
+ value[0] = screen->device->vram_size >> 20;
+ return 0;
+ case __DRI2_RENDERER_UNIFIED_MEMORY_ARCHITECTURE:
+ value[0] = 0;
+ return 0;
+ default:
+ return driQueryRendererIntegerCommon(psp, param, value);
+ }
+}
+
+static int
+nouveau_query_renderer_string(__DRIscreen *psp, int param, const char **value)
+{
+ const struct nouveau_screen *const screen =
+ (struct nouveau_screen *) psp->driverPrivate;
+
+ switch (param) {
+ case __DRI2_RENDERER_VENDOR_ID:
+ value[0] = nouveau_vendor_string;
+ return 0;
+ case __DRI2_RENDERER_DEVICE_ID:
+ value[0] = nouveau_get_renderer_string(screen->device->chipset);
+ return 0;
+ default:
+ return -1;
+ }
+}
+
+static const __DRI2rendererQueryExtension nouveau_renderer_query_extension = {
+ .base = { __DRI2_RENDERER_QUERY, 1 },
+
+ .queryInteger = nouveau_query_renderer_integer,
+ .queryString = nouveau_query_renderer_string
+};
+
static void
nouveau_destroy_screen(__DRIscreen *dri_screen)
{
}
static const struct __DRI2flushExtensionRec nouveau_flush_extension = {
- { __DRI2_FLUSH, 3 },
- nouveau_drawable_flush,
- dri2InvalidateDrawable,
+ .base = { __DRI2_FLUSH, 3 },
+
+ .flush = nouveau_drawable_flush,
+ .invalidate = dri2InvalidateDrawable,
};
static const struct __DRItexBufferExtensionRec nouveau_texbuffer_extension = {
- { __DRI_TEX_BUFFER, __DRI_TEX_BUFFER_VERSION },
- NULL,
- nouveau_set_texbuffer,
+ .base = { __DRI_TEX_BUFFER, 3 },
+
+ .setTexBuffer = NULL,
+ .setTexBuffer2 = nouveau_set_texbuffer,
+ .releaseTexBuffer = NULL,
};
static const __DRIextension *nouveau_screen_extensions[] = {
&nouveau_flush_extension.base,
&nouveau_texbuffer_extension.base,
+ &nouveau_renderer_query_extension.base,
&dri2ConfigQueryExtension.base,
NULL
};