aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/glx/glxdricommon.h
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2010-04-15 12:37:07 +0000
committermarha <marha@users.sourceforge.net>2010-04-15 12:37:07 +0000
commit8654ee514b4d79feec936501717a06892090d3b7 (patch)
tree2787608c117268bc6ed9e399ea57b8e1d0aeb8e3 /xorg-server/glx/glxdricommon.h
parenteb405babefc73e25ab8b7e6229709f85ef6a67b1 (diff)
downloadvcxsrv-8654ee514b4d79feec936501717a06892090d3b7.tar.gz
vcxsrv-8654ee514b4d79feec936501717a06892090d3b7.tar.bz2
vcxsrv-8654ee514b4d79feec936501717a06892090d3b7.zip
svn merge -r530:HEAD "^/branches/released" .
Diffstat (limited to 'xorg-server/glx/glxdricommon.h')
-rw-r--r--xorg-server/glx/glxdricommon.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/xorg-server/glx/glxdricommon.h b/xorg-server/glx/glxdricommon.h
index f88964b36..41e2d2770 100644
--- a/xorg-server/glx/glxdricommon.h
+++ b/xorg-server/glx/glxdricommon.h
@@ -33,7 +33,8 @@ struct __GLXDRIconfig {
};
__GLXconfig *
-glxConvertConfigs(const __DRIcoreExtension *core, const __DRIconfig **configs);
+glxConvertConfigs(const __DRIcoreExtension *core,
+ const __DRIconfig **configs, unsigned int drawableType);
extern const __DRIsystemTimeExtension systemTimeExtension;