fix fallback crashes when driver can't handle frag prog for i915 driver too (untested)
This commit is contained in:
@@ -59,6 +59,11 @@ do { \
|
||||
#define VRTX_TEX_SET_FMT(n, x) ((x)<<((n)*2))
|
||||
#define TEXBIND_SET(n, x) ((x)<<((n)*4))
|
||||
|
||||
static void
|
||||
i830_render_prevalidate(struct intel_context *intel)
|
||||
{
|
||||
}
|
||||
|
||||
static void i830_render_start( intelContextPtr intel )
|
||||
{
|
||||
GLcontext *ctx = &intel->ctx;
|
||||
@@ -531,4 +536,5 @@ void i830InitVtbl( i830ContextPtr i830 )
|
||||
i830->intel.vtbl.update_texture_state = i830UpdateTextureState;
|
||||
i830->intel.vtbl.emit_flush = i830_emit_flush;
|
||||
i830->intel.vtbl.render_start = i830_render_start;
|
||||
i830->intel.vtbl.render_prevalidate = i830_render_prevalidate;
|
||||
}
|
||||
|
||||
@@ -41,7 +41,8 @@
|
||||
#include "i915_reg.h"
|
||||
#include "i915_context.h"
|
||||
|
||||
static void i915_render_start( intelContextPtr intel )
|
||||
static void
|
||||
i915_render_prevalidate(struct intel_context *intel)
|
||||
{
|
||||
GLcontext *ctx = &intel->ctx;
|
||||
i915ContextPtr i915 = I915_CONTEXT(intel);
|
||||
@@ -54,6 +55,10 @@ static void i915_render_start( intelContextPtr intel )
|
||||
}
|
||||
}
|
||||
|
||||
static void i915_render_start( intelContextPtr intel )
|
||||
{
|
||||
}
|
||||
|
||||
|
||||
static void i915_reduced_primitive_state( intelContextPtr intel,
|
||||
GLenum rprim )
|
||||
@@ -454,6 +459,7 @@ void i915InitVtbl( i915ContextPtr i915 )
|
||||
i915->intel.vtbl.lost_hardware = i915_lost_hardware;
|
||||
i915->intel.vtbl.reduced_primitive_state = i915_reduced_primitive_state;
|
||||
i915->intel.vtbl.render_start = i915_render_start;
|
||||
i915->intel.vtbl.render_prevalidate = i915_render_prevalidate;
|
||||
i915->intel.vtbl.set_color_region = i915_set_color_region;
|
||||
i915->intel.vtbl.set_z_region = i915_set_z_region;
|
||||
i915->intel.vtbl.update_color_z_regions = i915_update_color_z_regions;
|
||||
|
||||
@@ -112,6 +112,7 @@ struct intel_context
|
||||
void (*update_texture_state)( intelContextPtr intel );
|
||||
|
||||
void (*render_start)( intelContextPtr intel );
|
||||
void (*render_prevalidate) (struct intel_context * intel);
|
||||
void (*set_color_region)( intelContextPtr intel, const intelRegion *reg );
|
||||
void (*set_z_region)( intelContextPtr intel, const intelRegion *reg );
|
||||
void (*update_color_z_regions)(intelContextPtr intel,
|
||||
|
||||
@@ -199,6 +199,8 @@ static GLboolean intel_run_render( GLcontext *ctx,
|
||||
struct vertex_buffer *VB = &tnl->vb;
|
||||
GLuint i;
|
||||
|
||||
intel->vtbl.render_prevalidate( intel );
|
||||
|
||||
/* Don't handle clipping or indexed vertices.
|
||||
*/
|
||||
if (intel->RenderIndex != 0 ||
|
||||
|
||||
@@ -308,12 +308,6 @@ extern GLboolean i915CreateContext(const __GLcontextModes * mesaVis,
|
||||
void *sharedContextPrivate);
|
||||
|
||||
|
||||
/*======================================================================
|
||||
* i915_texprog.c
|
||||
*/
|
||||
extern void i915ValidateTextureProgram(struct i915_context *i915);
|
||||
|
||||
|
||||
/*======================================================================
|
||||
* i915_debug.c
|
||||
*/
|
||||
|
||||
Reference in New Issue
Block a user