*
*/
+#include <stdbool.h>
+#include <stdio.h>
#include "nouveau_driver.h"
#include "nouveau_context.h"
#include "nouveau_bufferobj.h"
#include "nouveau_fbo.h"
+#include "nv_object.xml.h"
+#include "main/api_exec.h"
#include "main/dd.h"
#include "main/framebuffer.h"
+#include "main/fbobject.h"
#include "main/light.h"
#include "main/state.h"
+#include "main/version.h"
+#include "main/vtxfmt.h"
#include "drivers/common/meta.h"
#include "drivers/common/driverfuncs.h"
#include "swrast/swrast.h"
#include "tnl/tnl.h"
#include "tnl/t_context.h"
-#define need_GL_EXT_framebuffer_object
-#define need_GL_EXT_fog_coord
-#define need_GL_EXT_secondary_color
-
-#include "main/remap_helper.h"
-
-static const struct dri_extension nouveau_extensions[] = {
- { "GL_ARB_multitexture", NULL },
- { "GL_ARB_texture_env_add", NULL },
- { "GL_ARB_texture_env_combine", NULL },
- { "GL_ARB_texture_env_dot3", NULL },
- { "GL_ARB_texture_mirrored_repeat", NULL },
- { "GL_EXT_fog_coord", GL_EXT_fog_coord_functions },
- { "GL_EXT_framebuffer_blit", NULL },
- { "GL_EXT_framebuffer_object", GL_EXT_framebuffer_object_functions },
- { "GL_EXT_secondary_color", GL_EXT_secondary_color_functions },
- { "GL_EXT_stencil_wrap", NULL },
- { "GL_EXT_texture_lod_bias", NULL },
- { "GL_NV_blend_square", NULL },
- { "GL_NV_texture_env_combine4", NULL },
- { "GL_SGIS_generate_mipmap", NULL },
- { NULL, NULL }
-};
-
-static void
-nouveau_channel_flush_notify(struct nouveau_channel *chan)
-{
- struct nouveau_context *nctx = chan->user_private;
- GLcontext *ctx = &nctx->base;
-
- if (nctx->fallback < SWRAST)
- nouveau_bo_state_emit(ctx);
-}
-
GLboolean
nouveau_context_create(gl_api api,
- const __GLcontextModes *visual, __DRIcontext *dri_ctx,
+ const struct gl_config *visual, __DRIcontext *dri_ctx,
+ const struct __DriverContextConfig *ctx_config,
+ unsigned *error,
void *share_ctx)
{
__DRIscreen *dri_screen = dri_ctx->driScreenPriv;
- struct nouveau_screen *screen = dri_screen->private;
+ struct nouveau_screen *screen = dri_screen->driverPrivate;
struct nouveau_context *nctx;
- GLcontext *ctx;
+ struct gl_context *ctx;
- ctx = screen->driver->context_create(screen, visual, share_ctx);
- if (!ctx)
+ if (ctx_config->flags & ~(__DRI_CTX_FLAG_DEBUG | __DRI_CTX_FLAG_NO_ERROR)) {
+ *error = __DRI_CTX_ERROR_UNKNOWN_FLAG;
+ return false;
+ }
+
+ if (ctx_config->attribute_mask) {
+ *error = __DRI_CTX_ERROR_UNKNOWN_ATTRIBUTE;
+ return false;
+ }
+
+ ctx = screen->driver->context_create(screen, api, visual, share_ctx);
+ if (!ctx) {
+ *error = __DRI_CTX_ERROR_NO_MEMORY;
return GL_FALSE;
+ }
+
+ driContextSetFlags(ctx, ctx_config->flags);
nctx = to_nouveau_context(ctx);
nctx->dri_context = dri_ctx;
dri_ctx->driverPrivate = ctx;
+ _mesa_compute_version(ctx);
+ if (ctx->Version < (ctx_config->major_version * 10 +
+ ctx_config->minor_version)) {
+ nouveau_context_destroy(dri_ctx);
+ *error = __DRI_CTX_ERROR_BAD_VERSION;
+ return GL_FALSE;
+ }
+
+ /* Exec table initialization requires the version to be computed */
+ _mesa_initialize_dispatch_tables(ctx);
+ _mesa_initialize_vbo_vtxfmt(ctx);
+
+ if (nouveau_bo_new(context_dev(ctx), NOUVEAU_BO_VRAM, 0, 4096,
+ NULL, &nctx->fence)) {
+ nouveau_context_destroy(dri_ctx);
+ *error = __DRI_CTX_ERROR_NO_MEMORY;
+ return GL_FALSE;
+ }
+
+ *error = __DRI_CTX_ERROR_SUCCESS;
return GL_TRUE;
}
GLboolean
-nouveau_context_init(GLcontext *ctx, struct nouveau_screen *screen,
- const GLvisual *visual, GLcontext *share_ctx)
+nouveau_context_init(struct gl_context *ctx, gl_api api,
+ struct nouveau_screen *screen,
+ const struct gl_config *visual, struct gl_context *share_ctx)
{
struct nouveau_context *nctx = to_nouveau_context(ctx);
struct dd_function_table functions;
/* Initialize the function pointers. */
_mesa_init_driver_functions(&functions);
+ _tnl_init_driver_draw_function(&functions);
nouveau_driver_functions_init(&functions);
nouveau_bufferobj_functions_init(&functions);
nouveau_texture_functions_init(&functions);
nouveau_fbo_functions_init(&functions);
/* Initialize the mesa context. */
- _mesa_initialize_context(ctx, visual, share_ctx, &functions, NULL);
+ if (!_mesa_initialize_context(ctx, api, visual, share_ctx, &functions))
+ return GL_FALSE;
nouveau_state_init(ctx);
- nouveau_bo_state_init(ctx);
+ nouveau_scratch_init(ctx);
_mesa_meta_init(ctx);
_swrast_CreateContext(ctx);
- _vbo_CreateContext(ctx);
+ _vbo_CreateContext(ctx, true);
_tnl_CreateContext(ctx);
nouveau_span_functions_init(ctx);
_mesa_allow_light_in_model(ctx, GL_FALSE);
/* Allocate a hardware channel. */
- ret = nouveau_channel_alloc(context_dev(ctx), 0xbeef0201, 0xbeef0202,
- &nctx->hw.chan);
+ ret = nouveau_object_new(&context_dev(ctx)->object, 0xbeef0000,
+ NOUVEAU_FIFO_CHANNEL_CLASS,
+ &(struct nv04_fifo){
+ .vram = 0xbeef0201,
+ .gart = 0xbeef0202
+ }, sizeof(struct nv04_fifo), &nctx->hw.chan);
if (ret) {
nouveau_error("Error initializing the FIFO.\n");
return GL_FALSE;
}
- nctx->hw.chan->flush_notify = nouveau_channel_flush_notify;
- nctx->hw.chan->user_private = nctx;
+ /* Allocate a client (thread data) */
+ ret = nouveau_client_new(context_dev(ctx), &nctx->hw.client);
+ if (ret) {
+ nouveau_error("Error creating thread data\n");
+ return GL_FALSE;
+ }
+
+ /* Allocate a push buffer */
+ ret = nouveau_pushbuf_new(nctx->hw.client, nctx->hw.chan, 4,
+ 512 * 1024, true, &nctx->hw.pushbuf);
+ if (ret) {
+ nouveau_error("Error allocating DMA push buffer\n");
+ return GL_FALSE;
+ }
+
+ /* Allocate buffer context */
+ ret = nouveau_bufctx_new(nctx->hw.client, 16, &nctx->hw.bufctx);
+ if (ret) {
+ nouveau_error("Error allocating buffer context\n");
+ return GL_FALSE;
+ }
+
+ nctx->hw.pushbuf->user_priv = nctx->hw.bufctx;
+
+ /* Allocate NULL object */
+ ret = nouveau_object_new(nctx->hw.chan, 0x00000000, NV01_NULL_CLASS,
+ NULL, 0, &nctx->hw.null);
+ if (ret) {
+ nouveau_error("Error allocating NULL object\n");
+ return GL_FALSE;
+ }
/* Enable any supported extensions. */
- driInitExtensions(ctx, nouveau_extensions, GL_TRUE);
+ ctx->Extensions.EXT_blend_color = true;
+ ctx->Extensions.EXT_blend_minmax = true;
+ ctx->Extensions.EXT_texture_filter_anisotropic = true;
+ ctx->Extensions.NV_texture_env_combine4 = true;
+ ctx->Const.MaxDrawBuffers = ctx->Const.MaxColorAttachments = 1;
+
+ /* This effectively disables 3D textures */
+ ctx->Const.Max3DTextureLevels = 1;
return GL_TRUE;
}
void
-nouveau_context_deinit(GLcontext *ctx)
+nouveau_context_deinit(struct gl_context *ctx)
{
struct nouveau_context *nctx = to_nouveau_context(ctx);
if (TNL_CONTEXT(ctx))
_tnl_DestroyContext(ctx);
- if (vbo_context(ctx))
- _vbo_DestroyContext(ctx);
+ _vbo_DestroyContext(ctx);
if (SWRAST_CONTEXT(ctx))
_swrast_DestroyContext(ctx);
if (ctx->Meta)
_mesa_meta_free(ctx);
- if (nctx->hw.chan)
- nouveau_channel_free(&nctx->hw.chan);
+ nouveau_bufctx_del(&nctx->hw.bufctx);
+ nouveau_pushbuf_del(&nctx->hw.pushbuf);
+ nouveau_client_del(&nctx->hw.client);
+ nouveau_object_del(&nctx->hw.chan);
- nouveau_bo_state_destroy(ctx);
+ nouveau_scratch_destroy(ctx);
_mesa_free_context_data(ctx);
}
nouveau_context_destroy(__DRIcontext *dri_ctx)
{
struct nouveau_context *nctx = dri_ctx->driverPrivate;
- GLcontext *ctx = &nctx->base;
+ struct gl_context *ctx = &nctx->base;
+ nouveau_bo_ref(NULL, &nctx->fence);
context_drv(ctx)->context_destroy(ctx);
}
void
nouveau_update_renderbuffers(__DRIcontext *dri_ctx, __DRIdrawable *draw)
{
- GLcontext *ctx = dri_ctx->driverPrivate;
+ struct gl_context *ctx = dri_ctx->driverPrivate;
+ struct nouveau_context *nctx = to_nouveau_context(ctx);
__DRIscreen *screen = dri_ctx->driScreenPriv;
struct gl_framebuffer *fb = draw->driverPrivate;
+ struct nouveau_framebuffer *nfb = to_nouveau_framebuffer(fb);
unsigned int attachments[10];
__DRIbuffer *buffers = NULL;
int i = 0, count, ret;
- if (draw->lastStamp == *draw->pStamp)
+ if (draw->lastStamp == draw->dri2.stamp)
return;
- draw->lastStamp = *draw->pStamp;
+ draw->lastStamp = draw->dri2.stamp;
- attachments[i++] = __DRI_BUFFER_FRONT_LEFT;
+ if (nfb->need_front)
+ attachments[i++] = __DRI_BUFFER_FRONT_LEFT;
if (fb->Visual.doubleBufferMode)
attachments[i++] = __DRI_BUFFER_BACK_LEFT;
- if (fb->Visual.haveDepthBuffer && fb->Visual.haveStencilBuffer)
+ if (fb->Visual.depthBits > 0 && fb->Visual.stencilBits > 0)
attachments[i++] = __DRI_BUFFER_DEPTH_STENCIL;
- else if (fb->Visual.haveDepthBuffer)
+ else if (fb->Visual.depthBits > 0)
attachments[i++] = __DRI_BUFFER_DEPTH;
- else if (fb->Visual.haveStencilBuffer)
+ else if (fb->Visual.stencilBits > 0)
attachments[i++] = __DRI_BUFFER_STENCIL;
- buffers = (*screen->dri2.loader->getBuffers)(draw, &draw->w, &draw->h,
- attachments, i, &count,
- draw->loaderPrivate);
+ buffers = screen->dri2.loader->getBuffers(draw, &draw->w, &draw->h,
+ attachments, i, &count,
+ draw->loaderPrivate);
if (buffers == NULL)
return;
for (i = 0; i < count; i++) {
struct gl_renderbuffer *rb;
struct nouveau_surface *s;
- uint32_t old_handle;
+ uint32_t old_name;
int index;
switch (buffers[i].attachment) {
s->pitch = buffers[i].pitch;
s->cpp = buffers[i].cpp;
- /* Don't bother to reopen the bo if it happens to be
- * the same. */
- if (s->bo) {
- ret = nouveau_bo_handle_get(s->bo, &old_handle);
- assert(!ret);
+ if (index == BUFFER_DEPTH && s->bo) {
+ ret = nouveau_bo_name_get(s->bo, &old_name);
+ /*
+ * Disable fast Z clears in the next frame, the
+ * depth buffer contents are undefined.
+ */
+ if (!ret && old_name != buffers[i].name)
+ nctx->hierz.clear_seq = 0;
}
- if (!s->bo || old_handle != buffers[i].name) {
- nouveau_bo_ref(NULL, &s->bo);
- ret = nouveau_bo_handle_ref(context_dev(ctx),
- buffers[i].name, &s->bo);
- assert(!ret);
- }
+ nouveau_bo_ref(NULL, &s->bo);
+ ret = nouveau_bo_name_ref(context_dev(ctx),
+ buffers[i].name, &s->bo);
+ assert(!ret);
}
- _mesa_resize_framebuffer(NULL, fb, draw->w, draw->h);
+ _mesa_resize_framebuffer(ctx, fb, draw->w, draw->h);
}
static void
update_framebuffer(__DRIcontext *dri_ctx, __DRIdrawable *draw,
int *stamp)
{
- GLcontext *ctx = dri_ctx->driverPrivate;
+ struct gl_context *ctx = dri_ctx->driverPrivate;
struct gl_framebuffer *fb = draw->driverPrivate;
- *stamp = *draw->pStamp;
+ *stamp = draw->dri2.stamp;
nouveau_update_renderbuffers(dri_ctx, draw);
_mesa_resize_framebuffer(ctx, fb, draw->w, draw->h);
+ /* Clean up references to the old framebuffer objects. */
context_dirty(ctx, FRAMEBUFFER);
+ nouveau_bufctx_reset(to_nouveau_context(ctx)->hw.bufctx, BUFCTX_FB);
+ PUSH_KICK(context_push(ctx));
}
GLboolean
{
if (dri_ctx) {
struct nouveau_context *nctx = dri_ctx->driverPrivate;
- GLcontext *ctx = &nctx->base;
+ struct gl_context *ctx = &nctx->base;
/* Ask the X server for new renderbuffers. */
if (dri_draw->driverPrivate != ctx->WinSysDrawBuffer)
dri_read->driverPrivate);
_mesa_update_state(ctx);
- FIRE_RING(context_chan(ctx));
-
} else {
_mesa_make_current(NULL, NULL, NULL);
}
GLboolean
nouveau_context_unbind(__DRIcontext *dri_ctx)
{
- /* Unset current context and dispath table */
+ /* Unset current context and dispatch table */
_mesa_make_current(NULL, NULL, NULL);
return GL_TRUE;
}
void
-nouveau_fallback(GLcontext *ctx, enum nouveau_fallback mode)
+nouveau_fallback(struct gl_context *ctx, enum nouveau_fallback mode)
{
struct nouveau_context *nctx = to_nouveau_context(ctx);
nctx->fallback = MAX2(HWTNL, mode);
- if (mode < SWRAST)
+ if (mode < SWRAST) {
nouveau_state_emit(ctx);
- else
- FIRE_RING(context_chan(ctx));
+#if 0
+ nouveau_bo_state_emit(ctx);
+#endif
+ } else {
+ PUSH_KICK(context_push(ctx));
+ }
+}
+
+static void
+validate_framebuffer(__DRIcontext *dri_ctx, __DRIdrawable *draw,
+ int *stamp)
+{
+ struct gl_framebuffer *fb = draw->driverPrivate;
+ struct nouveau_framebuffer *nfb = to_nouveau_framebuffer(fb);
+ GLboolean need_front =
+ (fb->_ColorDrawBufferIndexes[0] == BUFFER_FRONT_LEFT ||
+ fb->_ColorReadBufferIndex == BUFFER_FRONT_LEFT);
+
+ if (nfb->need_front != need_front) {
+ nfb->need_front = need_front;
+ dri2InvalidateDrawable(draw);
+ }
+
+ if (draw->dri2.stamp != *stamp)
+ update_framebuffer(dri_ctx, draw, stamp);
}
void
-nouveau_validate_framebuffer(GLcontext *ctx)
+nouveau_validate_framebuffer(struct gl_context *ctx)
{
__DRIcontext *dri_ctx = to_nouveau_context(ctx)->dri_context;
__DRIdrawable *dri_draw = dri_ctx->driDrawablePriv;
__DRIdrawable *dri_read = dri_ctx->driReadablePriv;
- if (ctx->DrawBuffer->Name == 0 &&
- dri_ctx->dri2.draw_stamp != *dri_draw->pStamp)
- update_framebuffer(dri_ctx, dri_draw,
- &dri_ctx->dri2.draw_stamp);
+ if (_mesa_is_winsys_fbo(ctx->DrawBuffer))
+ validate_framebuffer(dri_ctx, dri_draw,
+ &dri_ctx->dri2.draw_stamp);
- if (ctx->ReadBuffer->Name == 0 && dri_draw != dri_read &&
- dri_ctx->dri2.read_stamp != *dri_read->pStamp)
- update_framebuffer(dri_ctx, dri_read,
- &dri_ctx->dri2.read_stamp);
+ if (_mesa_is_winsys_fbo(ctx->ReadBuffer))
+ validate_framebuffer(dri_ctx, dri_read,
+ &dri_ctx->dri2.read_stamp);
- if (nouveau_next_dirty_state(ctx) >= 0) {
- nouveau_state_emit(ctx);
- FIRE_RING(context_chan(ctx));
- }
+ if (ctx->NewState & _NEW_BUFFERS)
+ _mesa_update_state(ctx);
}
projects / mesa.git / blobdiff