#include "main/mtypes.h"
#include "main/extensions.h"
#include "main/context.h"
+#include "main/debug_output.h"
#include "main/texobj.h"
#include "main/teximage.h"
#include "main/texstate.h"
#include "st_texture.h"
#include "st_context.h"
+#include "st_debug.h"
#include "st_extensions.h"
#include "st_format.h"
#include "st_cb_fbo.h"
struct st_framebuffer *stread)
{
if (stdraw && stdraw->stamp != st->draw_stamp) {
- st->dirty.st |= ST_NEW_FRAMEBUFFER;
+ st->dirty |= ST_NEW_FRAMEBUFFER;
_mesa_resize_framebuffer(st->ctx, &stdraw->Base,
stdraw->Base.Width,
stdraw->Base.Height);
if (stread && stread->stamp != st->read_stamp) {
if (stread != stdraw) {
- st->dirty.st |= ST_NEW_FRAMEBUFFER;
+ st->dirty |= ST_NEW_FRAMEBUFFER;
_mesa_resize_framebuffer(st->ctx, &stread->Base,
stread->Base.Width,
stread->Base.Height);
mode->rgbBits = mode->redBits +
mode->greenBits + mode->blueBits + mode->alphaBits;
+ mode->sRGBCapable = util_format_is_srgb(visual->color_format);
}
if (visual->depth_stencil_format != PIPE_FORMAT_NONE) {
}
pipe_resource_reference(&stImage->pt, tex);
- stObj->width0 = width;
- stObj->height0 = height;
- stObj->depth0 = depth;
stObj->surface_format = pipe_format;
_mesa_dirty_texobj(ctx, texObj);
struct pipe_context *pipe;
struct gl_config mode;
gl_api api;
+ unsigned ctx_flags = 0;
if (!(stapi->profile_mask & (1 << attribs->profile)))
return NULL;
default:
*error = ST_CONTEXT_ERROR_BAD_API;
return NULL;
- break;
}
- pipe = smapi->screen->context_create(smapi->screen, NULL);
+ if (attribs->flags & ST_CONTEXT_FLAG_ROBUST_ACCESS)
+ ctx_flags |= PIPE_CONTEXT_ROBUST_BUFFER_ACCESS;
+
+ pipe = smapi->screen->context_create(smapi->screen, NULL, ctx_flags);
if (!pipe) {
*error = ST_CONTEXT_ERROR_NO_MEMORY;
return NULL;
return NULL;
}
- if (attribs->flags & ST_CONTEXT_FLAG_DEBUG){
+ if (attribs->flags & ST_CONTEXT_FLAG_DEBUG) {
if (!_mesa_set_debug_state_int(st->ctx, GL_DEBUG_OUTPUT, GL_TRUE)) {
*error = ST_CONTEXT_ERROR_NO_MEMORY;
return NULL;
}
+
st->ctx->Const.ContextFlags |= GL_CONTEXT_FLAG_DEBUG_BIT;
+
+ st_update_debug_callback(st);
}
if (attribs->flags & ST_CONTEXT_FLAG_FORWARD_COMPATIBLE)
return ret;
}
-static st_proc_t
-st_api_get_proc_address(struct st_api *stapi, const char *procname)
-{
- return (st_proc_t) _glapi_get_proc_address(procname);
-}
-
static void
st_api_destroy(struct st_api *stapi)
{
break;
default:
return FALSE;
- break;
}
if (!st_framebuffer_add_renderbuffer(stfb, idx))
struct gl_extensions extensions = {0};
GLuint version;
- if ((api == API_OPENGL_COMPAT || api == API_OPENGL_CORE) &&
- _mesa_override_gl_version_contextless(&consts, &api, &version)) {
+ if (_mesa_override_gl_version_contextless(&consts, &api, &version)) {
return version;
}
}
static const struct st_api st_gl_api = {
- "Mesa " PACKAGE_VERSION,
- ST_API_OPENGL,
- ST_PROFILE_DEFAULT_MASK |
- ST_PROFILE_OPENGL_CORE_MASK |
- ST_PROFILE_OPENGL_ES1_MASK |
- ST_PROFILE_OPENGL_ES2_MASK |
- 0,
- ST_API_FEATURE_MS_VISUALS_MASK,
- st_api_destroy,
- st_api_query_versions,
- st_api_get_proc_address,
- st_api_create_context,
- st_api_make_current,
- st_api_get_current,
+ .name = "Mesa " PACKAGE_VERSION,
+ .api = ST_API_OPENGL,
+ .profile_mask = ST_PROFILE_DEFAULT_MASK |
+ ST_PROFILE_OPENGL_CORE_MASK |
+ ST_PROFILE_OPENGL_ES1_MASK |
+ ST_PROFILE_OPENGL_ES2_MASK |
+ 0,
+ .feature_mask = ST_API_FEATURE_MS_VISUALS_MASK,
+ .destroy = st_api_destroy,
+ .query_versions = st_api_query_versions,
+ .create_context = st_api_create_context,
+ .make_current = st_api_make_current,
+ .get_current = st_api_get_current,
};
struct st_api *