X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fmesa%2Fdrivers%2Fdri%2Fradeon%2Fradeon_context.c;h=d4d19354b6dd718cf83b986dd5f880be057bb62f;hb=b9b66985c3d33fa0db2b49c0e0231aa6d341e183;hp=46dcafa68766dadb2fbfb2a3859b978daa07e140;hpb=26ebf9c5e106962aa440586296b8fde76ef0c76a;p=mesa.git diff --git a/src/mesa/drivers/dri/radeon/radeon_context.c b/src/mesa/drivers/dri/radeon/radeon_context.c index 46dcafa6876..d4d19354b6d 100644 --- a/src/mesa/drivers/dri/radeon/radeon_context.c +++ b/src/mesa/drivers/dri/radeon/radeon_context.c @@ -31,17 +31,19 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * Authors: * Kevin E. Martin * Gareth Hughes - * Keith Whitwell + * Keith Whitwell */ #include #include "main/glheader.h" #include "main/api_arrayelt.h" +#include "main/api_exec.h" #include "main/context.h" -#include "main/simple_list.h" +#include "util/simple_list.h" #include "main/imports.h" #include "main/extensions.h" -#include "main/mfeatures.h" +#include "main/version.h" +#include "main/vtxfmt.h" #include "swrast/swrast.h" #include "swrast_setup/swrast_setup.h" @@ -62,6 +64,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include "radeon_tcl.h" #include "radeon_queryobj.h" #include "radeon_blit.h" +#include "radeon_fog.h" #include "utils.h" #include "xmlpool.h" /* for symbolic values of enum-type options */ @@ -89,29 +92,6 @@ static const struct tnl_pipeline_stage *radeon_pipeline[] = { NULL, }; -static void r100_get_lock(radeonContextPtr radeon) -{ - r100ContextPtr rmesa = (r100ContextPtr)radeon; - drm_radeon_sarea_t *sarea = radeon->sarea; - - RADEON_STATECHANGE(rmesa, ctx); - if (rmesa->radeon.sarea->tiling_enabled) { - rmesa->hw.ctx.cmd[CTX_RB3D_COLORPITCH] |= - RADEON_COLOR_TILE_ENABLE; - } else { - rmesa->hw.ctx.cmd[CTX_RB3D_COLORPITCH] &= - ~RADEON_COLOR_TILE_ENABLE; - } - - if (sarea->ctx_owner != rmesa->radeon.dri.hwContext) { - sarea->ctx_owner = rmesa->radeon.dri.hwContext; - } -} - -static void r100_vtbl_emit_cs_header(struct radeon_cs *cs, radeonContextPtr rmesa) -{ -} - static void r100_vtbl_pre_emit_state(radeonContextPtr radeon) { r100ContextPtr rmesa = (r100ContextPtr)radeon; @@ -132,7 +112,7 @@ static void r100_emit_query_finish(radeonContextPtr radeon) BATCH_LOCALS(radeon); struct radeon_query_object *query = radeon->query.current; - BEGIN_BATCH_NO_AUTOSTATE(4); + BEGIN_BATCH(4); OUT_BATCH(CP_PACKET0(RADEON_RB3D_ZPASS_ADDR, 0)); OUT_BATCH_RELOC(0, query->bo, query->curr_offset, 0, RADEON_GEM_DOMAIN_GTT, 0); END_BATCH(); @@ -143,9 +123,6 @@ static void r100_emit_query_finish(radeonContextPtr radeon) static void r100_init_vtbl(radeonContextPtr radeon) { - radeon->vtbl.get_lock = r100_get_lock; - radeon->vtbl.update_viewport_offset = radeonUpdateViewportOffset; - radeon->vtbl.emit_cs_header = r100_vtbl_emit_cs_header; radeon->vtbl.swtcl_flush = r100_swtcl_flush; radeon->vtbl.pre_emit_state = r100_vtbl_pre_emit_state; radeon->vtbl.fallback = radeonFallback; @@ -154,6 +131,7 @@ static void r100_init_vtbl(radeonContextPtr radeon) radeon->vtbl.check_blit = r100_check_blit; radeon->vtbl.blit = r100_blit; radeon->vtbl.is_format_renderable = radeonIsFormatRenderable; + radeon->vtbl.revalidate_all_buffers = r100ValidateBuffers; } /* Create the device specific context. @@ -162,24 +140,41 @@ GLboolean r100CreateContext( gl_api api, const struct gl_config *glVisual, __DRIcontext *driContextPriv, + unsigned major_version, + unsigned minor_version, + uint32_t flags, + bool notify_reset, + unsigned *error, void *sharedContextPrivate) { __DRIscreen *sPriv = driContextPriv->driScreenPriv; - radeonScreenPtr screen = (radeonScreenPtr)(sPriv->private); + radeonScreenPtr screen = (radeonScreenPtr)(sPriv->driverPrivate); struct dd_function_table functions; r100ContextPtr rmesa; struct gl_context *ctx; int i; int tcl_mode, fthrottle_mode; + if (flags & ~__DRI_CTX_FLAG_DEBUG) { + *error = __DRI_CTX_ERROR_UNKNOWN_FLAG; + return false; + } + + if (notify_reset) { + *error = __DRI_CTX_ERROR_UNKNOWN_ATTRIBUTE; + return false; + } + assert(glVisual); assert(driContextPriv); assert(screen); /* Allocate the Radeon context */ - rmesa = (r100ContextPtr) CALLOC( sizeof(*rmesa) ); - if ( !rmesa ) + rmesa = calloc(1, sizeof(*rmesa)); + if ( !rmesa ) { + *error = __DRI_CTX_ERROR_NO_MEMORY; return GL_FALSE; + } rmesa->radeon.radeonScreen = screen; r100_init_vtbl(&rmesa->radeon); @@ -214,33 +209,37 @@ r100CreateContext( gl_api api, radeonInitTextureFuncs( &rmesa->radeon, &functions ); radeonInitQueryObjFunctions(&functions); - if (!radeonInitContext(&rmesa->radeon, &functions, + if (!radeonInitContext(&rmesa->radeon, api, &functions, glVisual, driContextPriv, sharedContextPrivate)) { - FREE(rmesa); + free(rmesa); + *error = __DRI_CTX_ERROR_NO_MEMORY; return GL_FALSE; } rmesa->radeon.swtcl.RenderIndex = ~0; rmesa->radeon.hw.all_dirty = GL_TRUE; - /* Set the maximum texture size small enough that we can guarentee that - * all texture units can bind a maximal texture and have all of them in - * texturable memory at once. Depending on the allow_large_textures driconf - * setting allow larger textures. + ctx = &rmesa->radeon.glCtx; + + driContextSetFlags(ctx, flags); + + /* Initialize the software rasterizer and helper modules. */ + _swrast_CreateContext( ctx ); + _vbo_CreateContext( ctx ); + _tnl_CreateContext( ctx ); + _swsetup_CreateContext( ctx ); + _ae_create_context( ctx ); - ctx = rmesa->radeon.glCtx; ctx->Const.MaxTextureUnits = driQueryOptioni (&rmesa->radeon.optionCache, "texture_units"); - ctx->Const.MaxTextureImageUnits = ctx->Const.MaxTextureUnits; + ctx->Const.Program[MESA_SHADER_FRAGMENT].MaxTextureImageUnits = ctx->Const.MaxTextureUnits; ctx->Const.MaxTextureCoordUnits = ctx->Const.MaxTextureUnits; ctx->Const.MaxCombinedTextureImageUnits = ctx->Const.MaxTextureUnits; ctx->Const.StripTextureBorder = GL_TRUE; - i = driQueryOptioni( &rmesa->radeon.optionCache, "allow_large_textures"); - /* FIXME: When no memory manager is available we should set this * to some reasonable value based on texture memory pool size */ ctx->Const.MaxTextureLevels = 12; @@ -278,15 +277,7 @@ r100CreateContext( gl_api api, ctx->Const.MaxColorAttachments = 1; ctx->Const.MaxRenderbufferSize = 2048; - _mesa_set_mvp_with_dp4( ctx, GL_TRUE ); - - /* Initialize the software rasterizer and helper modules. - */ - _swrast_CreateContext( ctx ); - _vbo_CreateContext( ctx ); - _tnl_CreateContext( ctx ); - _swsetup_CreateContext( ctx ); - _ae_create_context( ctx ); + ctx->Const.ShaderCompilerOptions[MESA_SHADER_VERTEX].OptimizeForAOS = true; /* Install the customized pipeline: */ @@ -312,39 +303,31 @@ r100CreateContext( gl_api api, _math_matrix_set_identity( &rmesa->tmpmat[i] ); } + ctx->Extensions.ARB_occlusion_query = true; ctx->Extensions.ARB_texture_border_clamp = true; + ctx->Extensions.ARB_texture_cube_map = true; ctx->Extensions.ARB_texture_env_combine = true; ctx->Extensions.ARB_texture_env_crossbar = true; ctx->Extensions.ARB_texture_env_dot3 = true; - ctx->Extensions.EXT_fog_coord = true; - ctx->Extensions.EXT_packed_depth_stencil = true; - ctx->Extensions.EXT_secondary_color = true; + ctx->Extensions.ARB_texture_mirror_clamp_to_edge = true; + ctx->Extensions.ATI_texture_env_combine3 = true; + ctx->Extensions.ATI_texture_mirror_once = true; ctx->Extensions.EXT_texture_env_dot3 = true; ctx->Extensions.EXT_texture_filter_anisotropic = true; ctx->Extensions.EXT_texture_mirror_clamp = true; - ctx->Extensions.ATI_texture_env_combine3 = true; - ctx->Extensions.ATI_texture_mirror_once = true; ctx->Extensions.MESA_ycbcr_texture = true; - ctx->Extensions.NV_blend_square = true; -#if FEATURE_OES_EGL_image + ctx->Extensions.NV_texture_rectangle = true; ctx->Extensions.OES_EGL_image = true; -#endif - - ctx->Extensions.EXT_framebuffer_object = true; - - ctx->Extensions.ARB_texture_cube_map = true; - if (rmesa->radeon.glCtx->Mesa_DXTn) { + if (rmesa->radeon.glCtx.Mesa_DXTn) { ctx->Extensions.EXT_texture_compression_s3tc = true; - ctx->Extensions.S3_s3tc = true; + ctx->Extensions.ANGLE_texture_compression_dxt = true; } else if (driQueryOptionb (&rmesa->radeon.optionCache, "force_s3tc_enable")) { ctx->Extensions.EXT_texture_compression_s3tc = true; + ctx->Extensions.ANGLE_texture_compression_dxt = true; } - ctx->Extensions.NV_texture_rectangle = true; - ctx->Extensions.ARB_occlusion_query = true; - /* XXX these should really go right after _mesa_init_driver_functions() */ radeon_fbo_init(&rmesa->radeon); radeonInitSpanFuncs( ctx ); @@ -380,11 +363,19 @@ r100CreateContext( gl_api api, rmesa->radeon.radeonScreen->chip_flags &= ~RADEON_CHIPSET_TCL; fprintf(stderr, "Disabling HW TCL support\n"); } - TCL_FALLBACK(rmesa->radeon.glCtx, RADEON_TCL_FALLBACK_TCL_DISABLE, 1); + TCL_FALLBACK(&rmesa->radeon.glCtx, RADEON_TCL_FALLBACK_TCL_DISABLE, 1); } if (rmesa->radeon.radeonScreen->chip_flags & RADEON_CHIPSET_TCL) { /* _tnl_need_dlist_norm_lengths( ctx, GL_FALSE ); */ } + + _mesa_compute_version(ctx); + + /* Exec table initialization requires the version to be computed */ + _mesa_initialize_dispatch_tables(ctx); + _mesa_initialize_vbo_vtxfmt(ctx); + + *error = __DRI_CTX_ERROR_SUCCESS; return GL_TRUE; }