Browse Source

mesa: use new _vbo_install_exec_vtxfmt() function

Instead of reaching into the vbo_context object in vtxfmt.c

Reviewed-by: Roland Scheidegger <sroland@vmware.com>
tags/18.1-branchpoint
Brian Paul 7 years ago
parent
commit
d40fa42292
3 changed files with 15 additions and 2 deletions
  1. 1
    2
      src/mesa/main/vtxfmt.c
  2. 10
    0
      src/mesa/vbo/vbo_context.c
  3. 4
    0
      src/mesa/vbo/vbo_context.h

+ 1
- 2
src/mesa/main/vtxfmt.c View File

@@ -257,8 +257,7 @@ _mesa_install_save_vtxfmt(struct gl_context *ctx, const GLvertexformat *vfmt)
void
_mesa_initialize_vbo_vtxfmt(struct gl_context *ctx)
{
struct vbo_exec_context *exec = &vbo_context(ctx)->exec;
_mesa_install_exec_vtxfmt(ctx, &exec->vtxfmt);
_vbo_install_exec_vtxfmt(ctx);
if (ctx->API == API_OPENGL_COMPAT) {
_mesa_install_save_vtxfmt(ctx, &ctx->ListState.ListVtxfmt);
}

+ 10
- 0
src/mesa/vbo/vbo_context.c View File

@@ -28,6 +28,7 @@
#include "main/mtypes.h"
#include "main/bufferobj.h"
#include "math/m_eval.h"
#include "main/vtxfmt.h"
#include "vbo.h"
#include "vbo_context.h"

@@ -181,6 +182,15 @@ vbo_draw_indirect_prims(struct gl_context *ctx,
}


void
_vbo_install_exec_vtxfmt(struct gl_context *ctx)
{
struct vbo_context *vbo = vbo_context(ctx);

_mesa_install_exec_vtxfmt(ctx, &vbo->exec.vtxfmt);
}


GLboolean
_vbo_CreateContext(struct gl_context *ctx)
{

+ 4
- 0
src/mesa/vbo/vbo_context.h View File

@@ -110,6 +110,10 @@ vbo_exec_invalidate_state(struct gl_context *ctx)
}


void
_vbo_install_exec_vtxfmt(struct gl_context *ctx);


/**
* Return VP_x token to indicate whether we're running fixed-function
* vertex transformation, an NV vertex program or ARB vertex program/shader.

Loading…
Cancel
Save