diff options
| author | Ian Romanick <[email protected]> | 2009-09-25 16:57:38 -0700 |
|---|---|---|
| committer | Ian Romanick <[email protected]> | 2009-09-25 16:57:38 -0700 |
| commit | 8130375e775bd5ba6a47412b0ea8ec9f23dc5972 (patch) | |
| tree | 34925730997476c0e8046045551ffc4f0c317116 /src/mesa/drivers/dri/swrast/swrast.c | |
| parent | c19482b16f164ce1b6625d18950a4644e5834373 (diff) | |
| parent | 09af58d7ed7dfa8f2ce2b881bb849064e136c830 (diff) | |
Merge branch 'asm-shader-rework-2'
Conflicts:
src/mesa/shader/program_parse.tab.c
Diffstat (limited to 'src/mesa/drivers/dri/swrast/swrast.c')
| -rw-r--r-- | src/mesa/drivers/dri/swrast/swrast.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/mesa/drivers/dri/swrast/swrast.c b/src/mesa/drivers/dri/swrast/swrast.c index cd499cd5d2e..f4947daa063 100644 --- a/src/mesa/drivers/dri/swrast/swrast.c +++ b/src/mesa/drivers/dri/swrast/swrast.c @@ -116,6 +116,7 @@ const struct dri_extension card_extensions[] = { "GL_NV_depth_clamp", NULL }, { "GL_NV_vertex_program", GL_NV_vertex_program_functions }, { "GL_NV_fragment_program", GL_NV_fragment_program_functions }, + { "GL_NV_fragment_program_option", NULL }, { NULL, NULL } }; |