From af90c8c5119d84cbc85dd800167f5ea938b3f4c8 Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Tue, 9 Oct 2012 14:56:33 -0700 Subject: [PATCH] intel: Remove NV_vertex_program support. We were holding on to this code because we were aware that NWN 1 had some support for vertex programs -- no other linux programs I've come across would use it (since other software also has ARB_vp or GLSL support). Only, it turns out that NWN doesn't even give us any vertex programs. Given that we have known issues where the extension has never been fully supported, just give up on it. Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=46795 Reviewed-by: Brian Paul --- src/mesa/drivers/dri/i965/brw_vs_surface_state.c | 4 ---- src/mesa/drivers/dri/i965/gen6_vs_state.c | 3 --- src/mesa/drivers/dri/intel/intel_extensions.c | 2 -- 3 files changed, 9 deletions(-) diff --git a/src/mesa/drivers/dri/i965/brw_vs_surface_state.c b/src/mesa/drivers/dri/i965/brw_vs_surface_state.c index e29797e92fa..d70c36ef71d 100644 --- a/src/mesa/drivers/dri/i965/brw_vs_surface_state.c +++ b/src/mesa/drivers/dri/i965/brw_vs_surface_state.c @@ -44,7 +44,6 @@ static void brw_upload_vs_pull_constants(struct brw_context *brw) { - struct gl_context *ctx = &brw->intel.ctx; struct intel_context *intel = &brw->intel; /* BRW_NEW_VERTEX_PROGRAM */ struct brw_vertex_program *vp = @@ -52,9 +51,6 @@ brw_upload_vs_pull_constants(struct brw_context *brw) const struct gl_program_parameter_list *params = vp->program.Base.Parameters; int i; - if (vp->program.IsNVProgram) - _mesa_load_tracked_matrices(ctx); - /* Updates the ParamaterValues[i] pointers for all parameters of the * basic type of PROGRAM_STATE_VAR. */ diff --git a/src/mesa/drivers/dri/i965/gen6_vs_state.c b/src/mesa/drivers/dri/i965/gen6_vs_state.c index c562cc788ef..b15bc3d86f9 100644 --- a/src/mesa/drivers/dri/i965/gen6_vs_state.c +++ b/src/mesa/drivers/dri/i965/gen6_vs_state.c @@ -44,9 +44,6 @@ gen6_upload_vs_push_constants(struct brw_context *brw) unsigned int nr_params = brw->vs.prog_data->nr_params / 4; bool uses_clip_distance = vp->program.UsesClipDistance; - if (brw->vertex_program->IsNVProgram) - _mesa_load_tracked_matrices(ctx); - /* Updates the ParamaterValues[i] pointers for all parameters of the * basic type of PROGRAM_STATE_VAR. */ diff --git a/src/mesa/drivers/dri/intel/intel_extensions.c b/src/mesa/drivers/dri/intel/intel_extensions.c index 8a4648816eb..ec99c3e571a 100755 --- a/src/mesa/drivers/dri/intel/intel_extensions.c +++ b/src/mesa/drivers/dri/intel/intel_extensions.c @@ -83,8 +83,6 @@ intelInitExtensions(struct gl_context *ctx) ctx->Extensions.MESA_ycbcr_texture = true; ctx->Extensions.NV_blend_square = true; ctx->Extensions.NV_texture_rectangle = true; - ctx->Extensions.NV_vertex_program = true; - ctx->Extensions.NV_vertex_program1_1 = true; ctx->Extensions.TDFX_texture_compression_FXT1 = true; ctx->Extensions.OES_EGL_image = true; ctx->Extensions.OES_draw_texture = true; -- 2.30.2